ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/migrate/migrate_change_column4_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (boolean without limit)' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -12,11 +12,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.boolean  "registered"
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -27,8 +27,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.boolean  "registered"
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -40,8 +40,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change column (boolean with limit)' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -52,11 +52,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.boolean  "registered"
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -67,8 +67,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.boolean  "registered", limit: 1
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_column5_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (binary: blob -> varbinary)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -12,11 +12,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -27,8 +27,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", limit: 255
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -43,8 +43,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change column (binary: varbinary -> blob)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -55,11 +55,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", limit: 255
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -70,8 +70,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -86,8 +86,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change column (binary without limit)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -98,11 +98,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -113,8 +113,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name"
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_column6_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add column after id (pk: normal)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -12,11 +12,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", force: :cascade do |t|
           t.string   "ext_column", null: false
           t.date     "birth_date", null: false
@@ -28,8 +28,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", limit: 255
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -41,7 +41,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
 
-      expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-EOS)
+      expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `employees` (
           `id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
@@ -55,13 +55,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           `registered_name` varbinary(255) DEFAULT NULL,
           PRIMARY KEY (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
-      EOS
+      ERB
     }
   end
 
   context 'when add column after id (pk: emp_id)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_id", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -72,11 +72,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_id", force: :cascade do |t|
           t.string   "ext_column", null: false
           t.date     "birth_date", null: false
@@ -88,8 +88,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", limit: 255
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -101,7 +101,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
 
-      expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-EOS)
+      expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `employees` (
           `emp_id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
@@ -115,13 +115,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           `registered_name` varbinary(255) DEFAULT NULL,
           PRIMARY KEY (`emp_id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
-      EOS
+      ERB
     }
   end
 
   context 'when add column after id (pk: no pk)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", id: false, force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -132,11 +132,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", id: false, force: :cascade do |t|
           t.string   "ext_column", null: false
           t.date     "birth_date", null: false
@@ -148,8 +148,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", limit: 255
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -161,7 +161,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
 
-      expect(show_create_table_mysql('employees')).to match_fuzzy <<-EOS
+      expect(show_create_table_mysql('employees')).to match_fuzzy <<-SQL
         CREATE TABLE `employees` (
           `ext_column` varchar(255) NOT NULL,
           `birth_date` date NOT NULL,
@@ -173,13 +173,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           `updated_at` datetime NOT NULL,
           `registered_name` varbinary(255) DEFAULT NULL
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
-      EOS
+      SQL
     }
   end
 
   context 'when add column after id (pk: with pk delta)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", force: :cascade do |t|
           t.date     "birth_date", null: false
           t.string   "first_name", limit: 14, null: false
@@ -190,11 +190,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", <%= i cond(5.0, limit: 65535) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_id", force: :cascade do |t|
           t.string   "ext_column", null: false
           t.date     "birth_date", null: false
@@ -206,8 +206,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.datetime "updated_at", null: false
           t.binary   "registered_name", limit: 255
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -219,7 +219,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl.sub(/, *primary_key: *"emp_id"/, '')
 
-      expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-EOS)
+      expect(show_create_table_mysql('employees')).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `employees` (
           `id` <%= cond('>= 5.1','bigint(20)', 'int(11)') %> NOT NULL AUTO_INCREMENT,
           `ext_column` varchar(255) NOT NULL,
@@ -233,7 +233,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           `registered_name` varbinary(255) DEFAULT NULL,
           PRIMARY KEY (`id`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
-      EOS
+      ERB
     }
   end
 end

data/spec/mysql/migrate/migrate_change_column7_spec.rb

@@ -1,15 +1,15 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'integer/limit:8 = bigint' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 8, null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_column8_spec.rb

@@ -1,23 +1,23 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   before { subject.diff(actual_dsl).migrate }
-  subject { client(:table_options => table_options, :dump_without_table_options => dump_without_table_options) }
+  subject { client(table_options: table_options, dump_without_table_options: dump_without_table_options) }
 
   let(:warning_regexp) { /table options differ/ }
   let(:dump_without_table_options) { false }
 
-  let(:actual_dsl) {
-    erbh(<<-EOS)
+  let(:actual_dsl) do
+    erbh(<<-ERB)
       create_table "employees", primary_key: "emp_no", force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
       end
-    EOS
-  }
+    ERB
+  end
 
-  let(:expected_dsl) {
-    erbh(<<-EOS)
+  let(:expected_dsl) do
+    erbh(<<-ERB)
       create_table :employees, primary_key: :emp_no, force: :cascade do |t|
       end
-    EOS
-  }
+    ERB
+  end
 
   context 'when change options (no change)' do
     let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8' }

data/spec/mysql/migrate/migrate_change_column_default_spec.rb

@@ -1,37 +1,37 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when default:0 -> (emply)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 4, null: true
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:result_dsl) {
-      erbh(<<-EOS)
+    let(:result_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no"
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -46,27 +46,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when default:0 -> (emply with null:false)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -81,16 +81,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when default:0 -> default:0' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -102,38 +102,38 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when default:0 -> default:0/null:true' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", limit: 4, default: 0, null: true
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:result_dsl) {
-      erbh(<<-EOS)
+    let(:result_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -148,38 +148,38 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when default:0/null:true -> default:nil/null:false' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:result_dsl) {
-      erbh(<<-EOS)
+    let(:result_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", <%= i cond(5.0, default: 0) + {null: false} %>
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }