ridgepole 0.6.5.beta → 0.6.5.beta2

data/spec/mysql/text_blob_types/text_blob_types_spec.rb

@@ -0,0 +1,84 @@
+describe 'Ridgepole::Client (with new text/blob types)', condition: [:activerecord_5] do
+  context 'when use new types' do
+    subject { client }
+
+    it do
+      delta = subject.diff(<<-EOS)
+        create_table :foos do |t|
+          t.blob             :blob
+          t.tinyblob         :tiny_blob
+          t.mediumblob       :medium_blob
+          t.longblob         :long_blob
+          t.tinytext         :tiny_text
+          t.mediumtext       :medium_text
+          t.longtext         :long_text
+          t.unsigned_decimal :unsigned_decimal
+          t.unsigned_float   :unsigned_float
+          t.unsigned_bigint  :unsigned_bigint
+          t.unsigned_integer :unsigned_integer
+        end
+      EOS
+
+      expect(delta.differ?).to be_truthy
+      delta.migrate
+
+      expect(subject.dump).to match_fuzzy <<-EOS
+        create_table "foos", force: :cascade do |t|
+          t.binary  "blob",             limit: 65535
+          t.blob    "tiny_blob",        limit: 255
+          t.binary  "medium_blob",      limit: 16777215
+          t.binary  "long_blob",        limit: 4294967295
+          t.text    "tiny_text",        limit: 255
+          t.text    "medium_text",      limit: 16777215
+          t.text    "long_text",        limit: 4294967295
+          t.decimal "unsigned_decimal", precision: 10, unsigned: true
+          t.float   "unsigned_float",   limit: 24, unsigned: true
+          t.bigint  "unsigned_bigint",  unsigned: true
+          t.integer "unsigned_integer", unsigned: true
+        end
+      EOS
+    end
+  end
+
+  context 'when compare new types' do
+    subject { client }
+
+    before do
+      subject.diff(<<-EOS).migrate
+        create_table :foos do |t|
+          t.blob             :blob
+          t.tinyblob         :tiny_blob
+          t.mediumblob       :medium_blob
+          t.longblob         :long_blob
+          t.tinytext         :tiny_text
+          t.mediumtext       :medium_text
+          t.longtext         :long_text
+          t.unsigned_decimal :unsigned_decimal
+          t.unsigned_float   :unsigned_float
+          t.unsigned_bigint  :unsigned_bigint
+          t.unsigned_integer :unsigned_integer
+        end
+      EOS
+    end
+
+    it do
+      delta = subject.diff(<<-EOS)
+        create_table :foos do |t|
+          t.blob             :blob
+          t.tinyblob         :tiny_blob
+          t.mediumblob       :medium_blob
+          t.longblob         :long_blob
+          t.tinytext         :tiny_text
+          t.mediumtext       :medium_text
+          t.longtext         :long_text
+          t.unsigned_decimal :unsigned_decimal
+          t.unsigned_float   :unsigned_float
+          t.unsigned_bigint  :unsigned_bigint
+          t.unsigned_integer :unsigned_integer
+        end
+      EOS
+
+      expect(delta.differ?).to be_falsey
+    end
+  end
+end

data/spec/mysql/~default_name_fk/migrate_change_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "parent", force: :cascade do |t|
 end
 
@@ -9,19 +9,19 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
       EOS
     }
 
     let(:sorted_actual_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", limit: 4
+  t.integer "parent_id", <%= i limit(4) %>
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end
@@ -31,12 +31,12 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :casc
     }
 
     let(:expected_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", limit: 4
+  t.integer "parent_id", <%= i limit(4) %>
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end
@@ -54,6 +54,12 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
+
+      # XXX:
+      if condition(:activerecord_5)
+        ActiveRecord::Base.connection.send(:create_table_info_cache).clear
+      end
+
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end

data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb

@@ -1,26 +1,14 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      unsigned: {}
-    }
-
-    if condition(:mysql_awesome_enabled)
-      opts[:unsigned] = {unsigned: true}
-    end
-
-    opts
-  }
-
   context 'when create fk' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
-create_table "child", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
-  t.integer "parent_id", <%= {limit: 4}.push(@unsigned).i %>
+      erbh(<<-EOS)
+create_table "child", <%= i unsigned(true) + {force: :cascade} %> do |t|
+  t.integer "parent_id", <%= i limit(4) + unsigned(true) %>
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
-create_table "parent", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
+create_table "parent", <%= i unsigned(true) + {force: :cascade} %> do |t|
 end
       EOS
     }
@@ -65,7 +53,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
   context 'when create fk when create table' do
     let(:dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
@@ -74,20 +62,20 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
     let(:sorted_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", limit: 4
+  t.integer "parent_id", <%= i limit(4) %>
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end
@@ -109,7 +97,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
   context 'already defined' do
     let(:dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
@@ -118,7 +106,7 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
@@ -137,7 +125,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
   context 'no name' do
     let(:dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end
@@ -146,7 +134,7 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent"
       EOS
@@ -163,7 +151,7 @@ add_foreign_key "child", "parent"
 
   context 'orphan fk' do
     let(:dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 # Define parent before child
 create_table "parent", force: :cascade do |t|
 end

data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "parent", force: :cascade do |t|
 end
 
@@ -9,7 +9,7 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
@@ -23,12 +23,12 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     let(:expected_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", limit: 4
+  t.integer "parent_id", <%= i limit(4) %>
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end
@@ -68,7 +68,7 @@ end
 
   context 'when drop fk when drop table' do
     let(:dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "parent", force: :cascade do |t|
 end
 
@@ -77,19 +77,19 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
     let(:sorted_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", limit: 4
+  t.integer "parent_id", <%= i limit(4) %>
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end

data/spec/postgresql/dump/dump_spec.rb

@@ -1,73 +1,97 @@
 describe 'Ridgepole::Client#dump' do
+  let(:template_variables) {
+    opts = {
+      departments_ext: {id: :string, limit: 4},
+      employees_ext: {id: :integer},
+      dept_manager_pk: {primary_key: ["emp_no", "dept_no"]},
+      dept_emp_pk: {primary_key: ["emp_no", "dept_no"]},
+      salaries_pk: {primary_key: ["emp_no", "from_date"]},
+      titles_pk: {primary_key: ["emp_no", "title", "from_date"]},
+    }
+
+    if condition(:activerecord_4)
+      opts.merge!(
+        departments_ext: {},
+        employees_ext: {},
+        dept_manager_pk: {id: false},
+        dept_emp_pk: {id: false},
+        salaries_pk: {id: false},
+        titles_pk: {id: false}
+      )
+    end
+
+    opts
+  }
+
   context 'when there is a tables' do
     before { restore_tables }
     subject { client }
 
     it {
-      expect(subject.dump).to match_fuzzy <<-EOS
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
         end
 
-        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
 
-        create_table "departments", primary_key: "dept_no", force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= i @departments_ext %>, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
-        add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree
+        <%= add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree %>
 
-        create_table "dept_emp", id: false, force: :cascade do |t|
+        create_table "dept_emp", <%= i @dept_emp_pk %>, force: :cascade 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: "idx_dept_emp_dept_no", using: :btree
-        add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree
+        <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
+        <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
 
-        create_table "dept_manager", id: false, force: :cascade do |t|
+        create_table "dept_manager", <%= i @dept_manager_pk %>, force: :cascade 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: "idx_dept_manager_dept_no", using: :btree
-        add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree
+        <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
+        <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
 
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no",  null: false
           t.integer "club_id", null: false
         end
 
-        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree
+        <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
 
-        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= i @employees_ext %>, force: :cascade 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.date   "hire_date",             null: false
         end
 
-        create_table "salaries", id: false, force: :cascade do |t|
+        create_table "salaries", <%= i @salaries_pk %>, force: :cascade 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: "idx_salaries_emp_no", using: :btree
+        <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
 
-        create_table "titles", id: false, force: :cascade do |t|
+        create_table "titles", <%= i @titles_pk %>, force: :cascade 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: "idx_titles_emp_no", using: :btree
+        <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
       EOS
     }
   end

data/spec/postgresql/fk/migrate_change_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "parent", force: :cascade do |t|
 end
 
@@ -9,19 +9,19 @@ create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
       EOS
     }
 
     let(:sorted_actual_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end
@@ -31,12 +31,12 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
     }
 
     let(:expected_dsl) {
-      <<-EOS
+      erbh(<<-EOS)
 create_table "child", force: :cascade do |t|
   t.integer "parent_id"
 end
 
-add_index "child", ["parent_id"], name: "par_id", using: :btree
+<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
 
 create_table "parent", force: :cascade do |t|
 end