ridgepole 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7284de718aedfc85207971f129586dffa5fd49a7
-  data.tar.gz: 2db55a88104e340788971af634b202ebf80a93db
+  metadata.gz: 74af55adebfffcd9880e5a0fde3e2eee3fc2c75d
+  data.tar.gz: 1b3255a9a2c1b29b3980b32739a55b83100542c3
 SHA512:
-  metadata.gz: ed41b7613dcd5e5a87b3673a27bffbad4043638203af53941d1798b77841a639cdb3d696ffff77bfed52d3bf3b8eebe0344f426d759eed4cb40e6ee108ddb46e
-  data.tar.gz: 875a498eba1c73fa5898d1522106bcddc4bf22045198823b9e1d486242cb33b607d0b901ae7ca02e51444e64cf3ce01983fdabe3f25645f496c726a134fad241
+  metadata.gz: 83ae32148265a558bb781c2eadf4cc3b988d2a4380fb66be2e7e13163b239e7ea1c3d1a4136f3d7149ede683338dc0fb2b0e8ced5c8d3b460fd4d9647bb10fe0
+  data.tar.gz: 9099196ec666a10f7da892c3af21302e654c0801516815e1a888eec86a034d649cfe4eb940cd8ffafa0cd457c08b63657a1cf05621a57793ee78773143a31a42

data/lib/ridgepole/dsl_parser.rb

@@ -8,6 +8,8 @@ class Ridgepole::DSLParser
       end
 
       def column(name, type, options = {})
+        name = name.to_s
+
         @__definition[name] = {
           :type => type,
           :options => options,
@@ -57,7 +59,13 @@ class Ridgepole::DSLParser
     end
 
     def create_table(table_name, options = {})
+      table_name = table_name.to_s
       table_definition = TableDefinition.new
+
+      [:primary_key].each do |key|
+        options[key] = options[key].to_s if options[key]
+      end
+
       yield(table_definition)
       @__definition[table_name] ||= {}
 
@@ -71,6 +79,9 @@ class Ridgepole::DSLParser
     end
 
     def add_index(table_name, column_name, options = {})
+      table_name = table_name.to_s
+      column_name = [column_name].flatten.map {|i| i.to_s }
+      options[:name] = options[:name].to_s if options[:name]
       @__definition[table_name] ||= {}
       @__definition[table_name][:indices] ||= {}
       idx = options[:name] || column_name

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/migrate/migrate_change_column2_spec.rb

@@ -0,0 +1,94 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change column (no change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        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
+
+        add_index "employees", ["gender"], name: "gender", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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
+
+        add_index :employees, :gender, name: :gender, using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change column (change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        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
+
+        add_index "employees", ["gender"], name: "gender", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        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_date2,             null: false
+        end
+
+        add_index :employees, :last_name, name: :last_name, using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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_date2",            null: false
+        end
+
+        add_index "employees", ["last_name"], name: "last_name", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
+    }
+  end
+end

data/spec/migrate/migrate_change_index2_spec.rb

@@ -0,0 +1,89 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change index (no change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        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
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change index (change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        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
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        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", "salary", name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+end

data/spec/migrate/migrate_change_index_spec.rb

@@ -1,5 +1,5 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when create index' do
+  context 'when change index' do
     let(:dsl) {
       <<-RUBY
         create_table "clubs", force: true do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -130,7 +130,9 @@ files:
 - spec/dump/dump_spec.rb
 - spec/migrate/check_orphan_index_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
+- spec/migrate/migrate_change_column2_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
+- spec/migrate/migrate_change_index2_spec.rb
 - spec/migrate/migrate_change_index_spec.rb
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to DB schema.
@@ -193,7 +195,9 @@ test_files:
 - spec/dump/dump_spec.rb
 - spec/migrate/check_orphan_index_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
+- spec/migrate/migrate_change_column2_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
+- spec/migrate/migrate_change_index2_spec.rb
 - spec/migrate/migrate_change_index_spec.rb
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb