tern 0.7.0 → 0.7.1

data/.rspec

@@ -0,0 +1 @@
+--colour

data/README.markdown

@@ -211,6 +211,14 @@ This will result in:
 
     DROP FUNCTION rendered_function();
     
+Version History
+===============
+
+* **0.7.1**
+  * Print friendly error message when database error occurs instead of stack trace.
+* **0.7.0**
+  * Added ERB processing to SQL files
+    
 License
 =======
 

data/lib/tern.rb

@@ -2,6 +2,9 @@ require 'sequel'
 require 'yaml'
 require 'erb'
 
+class TernError < StandardError
+end
+
 class Parser
   def render_text(text)
     ERB.new(text).result(binding)
@@ -14,12 +17,25 @@ class Parser
 end
 
 class Change
+  class DatabaseError < TernError
+  end
+
   SPLIT_MARKER = '---- CREATE above / DROP below ----'
 
   def self.parse(string)
     create_sql, drop_sql = Parser.new.render_text(string).split(SPLIT_MARKER)
     [create_sql, drop_sql]
   end
+  
+  def run(sql, context)
+    DB.run sql
+  rescue Sequel::DatabaseError
+    raise DatabaseError, "Error in #{context}\n#{$!.to_s}"
+  end
+  
+  attr_reader :create_sql
+  attr_reader :drop_sql
+  attr_reader :name
 end
 
 class Definition < Change
@@ -41,7 +57,7 @@ class Definition < Change
 
     def load_existing
       table.order(:id).all.map do |row|
-        new row[:id], row[:sequence], row[:create_sql], row[:drop_sql]
+        new "existing definition: #{row[:id]}", row[:id], row[:sequence], row[:create_sql], row[:drop_sql]
       end.group_by { |d| d.sequence }
     end
 
@@ -51,8 +67,9 @@ class Definition < Change
 
       definition_sequences.keys.each do |sequence|
         definition_sequences[sequence] = definition_sequences[sequence].map do |f|
-          create_sql, drop_sql = parse File.read(File.join(sequence_dir, f))
-          Definition.new nil, sequence, create_sql, drop_sql
+          path = File.join(sequence_dir, f)
+          create_sql, drop_sql = parse File.read(path)
+          Definition.new path, nil, sequence, create_sql, drop_sql
         end
       end
 
@@ -62,10 +79,9 @@ class Definition < Change
 
   attr_reader :id
   attr_reader :sequence
-  attr_reader :create_sql
-  attr_reader :drop_sql
-
-  def initialize(id, sequence, create_sql, drop_sql)
+  
+  def initialize(name, id, sequence, create_sql, drop_sql)
+    @name = name
     @id = id
     @sequence = sequence
     @create_sql = create_sql
@@ -73,12 +89,12 @@ class Definition < Change
   end
 
   def create
-    DB.run create_sql
+    run create_sql, name
     table.insert :sequence => sequence, :create_sql => create_sql, :drop_sql => drop_sql
   end
 
   def drop
-    DB.run drop_sql
+    run drop_sql, name
     table.filter(:id => id).delete
   end
 
@@ -88,13 +104,13 @@ class Definition < Change
 end
 
 class Alteration < Change
-  class IrreversibleAlteration < StandardError
+  class IrreversibleAlteration < TernError
   end
 
-  class MissingAlteration < StandardError
+  class MissingAlteration < TernError
   end
 
-  class DuplicateAlteration < StandardError
+  class DuplicateAlteration < TernError
   end
 
   class << self
@@ -126,7 +142,7 @@ class Alteration < Change
         raise "This can't happen" unless File.basename(path) =~ /^(\d+)/
         version = $1.to_i
         create_sql, drop_sql = parse File.read(path)
-        new version, create_sql, drop_sql
+        new path, version, create_sql, drop_sql
       end.sort_by(&:version)
 
       alterations.each_with_index do |a, i|
@@ -140,23 +156,22 @@ class Alteration < Change
   end
 
   attr_reader :version
-  attr_reader :create_sql
-  attr_reader :drop_sql
 
-  def initialize(version, create_sql, drop_sql)
+  def initialize(name, version, create_sql, drop_sql)
+    @name = name
     @version = version
     @create_sql = create_sql
     @drop_sql = drop_sql
   end
 
   def create
-    DB.run create_sql
+    run create_sql, name
     Alteration.version = version
   end
 
   def drop
     raise IrreversibleAlteration, "Alteration #{version.to_s.rjust(3, "0")} is irreversible" unless drop_sql
-    DB.run drop_sql
+    run drop_sql, name
     Alteration.version = version - 1
   end
 end

data/lib/tern/app.rb

@@ -33,7 +33,7 @@ class App < Thor
     begin
       tern = Tern.new(config['alterations']['table'], config['alterations']['column'], config['definitions']['table'])
       tern.migrate(:version => options["alteration_version"], :sequences => options["definition_sequences"])
-    rescue Alteration::IrreversibleAlteration, Alteration::MissingAlteration, Alteration::DuplicateAlteration
+    rescue TernError
       say $!, :red
     end
   end

data/spec/projects/alteration_with_error/alterations/001_create_people.sql

@@ -0,0 +1,8 @@
+CREATE TABLE people(
+  id serial PRIMARY KEY,
+  name varchar NOT NULL
+);
+
+---- CREATE above / DROP below ----
+
+DROP TABLE people;

data/spec/projects/alteration_with_error/alterations/002_create_animals.sql

@@ -0,0 +1,8 @@
+CREATE TABLE animals(
+  id serial PRIMARY KEY,
+  name varchar NOT NULL
+);
+
+---- CREATE above / DROP below ----
+
+DROP TABLE animals;

data/spec/projects/alteration_with_error/alterations/003_create_plants.sql

@@ -0,0 +1,10 @@
+INVALID SQL;
+
+CREATE TABLE plants(
+  id serial PRIMARY KEY,
+  name varchar NOT NULL
+);
+
+---- CREATE above / DROP below ----
+
+DROP TABLE plants;

data/spec/projects/alteration_with_error/config.yml

@@ -0,0 +1,15 @@
+alterations:
+  table: tern_alterations
+  column: version
+definitions:
+  table: tern_definitions
+environments:
+  development:
+    adapter: postgres
+    database: tern_test_development
+  test:
+    adapter: postgres
+    database: tern_test_test
+  production:
+    adapter: postgres
+    database: tern_test_production

data/spec/projects/alteration_with_error/definitions/sequence.yml

@@ -0,0 +1,18 @@
+# Put the relative path to your definition files in the sequence they should run.
+#
+# Most definitions should go in the default list. These will be dropped and
+# recreated every migration.
+#
+# Definitions that should not automatically be dropped and created can be put in
+# different lists. This is useful for definitions that make take prohibitively
+# to drop and create every migration such as check constraints.
+#
+# Run alternative sequences by specifying sequences in order to migrate command.
+# Example: rake migrate sequences=expensive,default
+#
+# default:
+#   - ultimate_answer.sql
+# expensive:
+#   - super_slow_check_constraint.sql
+
+default: []

data/spec/projects/alteration_with_error/definitions/ultimate_answer.sql.example

@@ -0,0 +1,7 @@
+CREATE FUNCTION ultimate_answer() RETURNS integer AS $$
+  SELECT 42;
+$$ LANGUAGE SQL;
+
+---- CREATE above / DROP below ----
+
+DROP FUNCTION ultimate_answer();

data/spec/projects/definition_with_error/alterations/001_create_people.sql.example

@@ -0,0 +1,16 @@
+Sequel.migration do
+  up do
+    run <<-END_SQL
+      CREATE TABLE people(
+        id serial PRIMARY KEY,
+        name varchar NOT NULL
+      );
+    END_SQL
+  end
+
+  down do
+    run <<-END_SQL
+      DROP TABLE people;
+    END_SQL
+  end
+end

data/spec/projects/definition_with_error/config.yml

@@ -0,0 +1,15 @@
+alterations:
+  table: tern_alterations
+  column: version
+definitions:
+  table: tern_definitions
+environments:
+  development:
+    adapter: postgres
+    database: tern_test_development
+  test:
+    adapter: postgres
+    database: tern_test_test
+  production:
+    adapter: postgres
+    database: tern_test_production

data/spec/projects/definition_with_error/definitions/sequence.yml

@@ -0,0 +1,19 @@
+# Put the relative path to your definition files in the sequence they should run.
+#
+# Most definitions should go in the default list. These will be dropped and
+# recreated every migration.
+#
+# Definitions that should not automatically be dropped and created can be put in
+# different lists. This is useful for definitions that make take prohibitively
+# to drop and create every migration such as check constraints.
+#
+# Run alternative sequences by specifying sequences in order to migrate command.
+# Example: rake migrate sequences=expensive,default
+#
+# default:
+#   - ultimate_answer.sql
+# expensive:
+#   - super_slow_check_constraint.sql
+
+default:
+  - ultimate_answer.sql

data/spec/projects/definition_with_error/definitions/ultimate_answer.sql

@@ -0,0 +1,9 @@
+INVALID SQL;
+
+CREATE FUNCTION ultimate_answer() RETURNS integer AS $$
+  SELECT 42;
+$$ LANGUAGE SQL;
+
+---- CREATE above / DROP below ----
+
+DROP FUNCTION ultimate_answer();

data/spec/tern_spec.rb

@@ -233,5 +233,19 @@ describe "tern" do
         expect { @dev_db[:a].all }.to raise_error(Sequel::DatabaseError)
       end
     end
+    
+    context "alteration with database error" do
+      it "prints an error message with file name" do
+        tern_migrate("spec/projects/alteration_with_error").should match /Error in alterations\/003_create_plants.sql/
+      end
+    end
+    
+    context "definition with database error" do
+      it "prints an error message with file name" do
+        tern_migrate("spec/projects/definition_with_error").should match /Error in definitions\/ultimate_answer.sql/
+      end
+    end
+    
+    
   end
 end

data/tern.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "tern"
-  s.version     = '0.7.0'
+  s.version     = '0.7.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jack Christensen"]
   s.email       = ["jack@jackchristensen.com"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Jack Christensen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -05:00
+date: 2011-06-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -85,12 +86,22 @@ files:
 - lib/tern/generators/new/config.yml.tt
 - lib/tern/generators/new/definitions/sequence.yml
 - lib/tern/generators/new/definitions/ultimate_answer.sql.example
+- spec/projects/alteration_with_error/alterations/001_create_people.sql
+- spec/projects/alteration_with_error/alterations/002_create_animals.sql
+- spec/projects/alteration_with_error/alterations/003_create_plants.sql
+- spec/projects/alteration_with_error/config.yml
+- spec/projects/alteration_with_error/definitions/sequence.yml
+- spec/projects/alteration_with_error/definitions/ultimate_answer.sql.example
 - spec/projects/alterations/alterations/001_create_people.sql
 - spec/projects/alterations/alterations/002_create_animals.sql
 - spec/projects/alterations/alterations/003_create_plants.sql
 - spec/projects/alterations/config.yml
 - spec/projects/alterations/definitions/sequence.yml
 - spec/projects/alterations/definitions/ultimate_answer.sql.example
+- spec/projects/definition_with_error/alterations/001_create_people.sql.example
+- spec/projects/definition_with_error/config.yml
+- spec/projects/definition_with_error/definitions/sequence.yml
+- spec/projects/definition_with_error/definitions/ultimate_answer.sql
 - spec/projects/definitions/alterations/001_create_people.sql.example
 - spec/projects/definitions/config.yml
 - spec/projects/definitions/definitions/sequence.yml