ridgepole 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 493879d39cd654fb10b76891dd5800b33c6b6f32
-  data.tar.gz: 8afa5e085f0866ad5edc4777162e0e18cb394943
+  metadata.gz: ab7f38bb9a9792744ec9d0be95c424623bebc485
+  data.tar.gz: b0c4a492af6b717721f638151ff2551179db198c
 SHA512:
-  metadata.gz: 449d9189b3b6e5e4bb1c9f72136379f19ad623527295dd75ab431028d13ab5dc2400e2766dbe7179e0bbd7bde9321c118f35c10256ccca4e2f1cec6e2d25cd8c
-  data.tar.gz: 04883048e57550f4d0bbc93ed4caed8aa7583cff0124706914890becbc4a28db942aebfee6b38d9e12a72688c8599066a1bb33ac19571642e4d3de8f325c1c94
+  metadata.gz: 0d98972b1adb24a14092700c87640bcdeb392807a1040f15ca919c4516366f49a93db7ba1c24aab4c8b44e4fb7e812cbdce672bc2cd3ae52dc9dc7e8732ce33f
+  data.tar.gz: d081472f63fcd0e1fec7adf35336965f1e8946edb41f524423c47261b84b2f57ea283e6d43cb0ce1753f98f041b740aa4c531b17b65aa3a32c98cfc08cdc2679

data/lib/ridgepole/delta.rb

@@ -1,4 +1,6 @@
 class Ridgepole::Delta
+  SCRIPT_NAME = '<Schema>'
+
   def initialize(delta, options = {})
     @delta = delta
     @options = options
@@ -57,7 +59,7 @@ class Ridgepole::Delta
         end
 
         Ridgepole::ExecuteExpander.without_operation(callback) do
-          ActiveRecord::Schema.new.instance_eval(script)
+          eval_script(script)
         end
 
         buf.string.strip
@@ -65,10 +67,51 @@ class Ridgepole::Delta
         ActiveRecord::Migration.disable_logging = disable_logging_orig
       end
     else
-      ActiveRecord::Schema.new.instance_eval(script)
+      eval_script(script)
+    end
+  end
+
+  def eval_script(script)
+    begin
+      ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
+    rescue => e
+      raise_exception(script, e)
+    end
+  end
+
+  def raise_exception(script, org)
+    lines = script.each_line
+    digit_number = (lines.count + 1).to_s.length
+    err_num = detect_error_line(org)
+
+    errmsg = lines.with_index.map {|l, i|
+      line_num = i + 1
+      prefix = (line_num == err_num) ? '* ' : '  '
+      "#{prefix}%*d: #{l}" % [digit_number, line_num]
+    }
+
+    if err_num > 0
+      from = err_num - 6
+      from = 0 if from < 0
+      to = err_num + 4
+      errmsg = errmsg.slice(from..to)
     end
+
+    e = RuntimeError.new(org.message + "\n" + errmsg.join)
+    e.set_backtrace(org.backtrace)
+    raise e
   end
 
+  def detect_error_line(e)
+    rgx = /\A#{Regexp.escape(SCRIPT_NAME)}:(\d+):/
+    line = e.backtrace.find {|i| i =~ rgx }
+
+    if line and (m = rgx.match(line))
+      m[1].to_i
+    else
+      0
+    end
+  end
 
   def append_create_table(table_name, attrs, buf)
     options = attrs[:options] || {}

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

data/spec/migrate/migrate_script_error_spec.rb

@@ -0,0 +1,89 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when database is empty' do
+    let(:actual_dsl) { '' }
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "Xclub_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+
+      errmsg = Regexp.new(Regexp.escape <<-EOS.strip)
+        33: add_index("employee_clubs", ["emp_no", "Xclub_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+      EOS
+
+      expect {
+        delta.migrate
+      }.to raise_error(RuntimeError, errmsg)
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -147,6 +147,7 @@ files:
 - spec/migrate/migrate_same_default_null_spec.rb
 - spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
+- spec/migrate/migrate_script_error_spec.rb
 - spec/migrate/migrate_skip_rename_column_spec.rb
 - spec/migrate/migrate_skip_rename_table_spec.rb
 - spec/migrate/migrate_with_ignore_tables_spec.rb
@@ -204,6 +205,7 @@ test_files:
 - spec/migrate/migrate_same_default_null_spec.rb
 - spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
+- spec/migrate/migrate_script_error_spec.rb
 - spec/migrate/migrate_skip_rename_column_spec.rb
 - spec/migrate/migrate_skip_rename_table_spec.rb
 - spec/migrate/migrate_with_ignore_tables_spec.rb