ridgepole 0.5.2.beta4 → 0.5.2.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e907b4bef3d7a181ac9c118a7b75c225188127b8
-  data.tar.gz: c658118bb1bf200595fe5267dc30d56c55e3bf24
+  metadata.gz: de9a514d07eefef782978b4596ba99e7f6e2b34a
+  data.tar.gz: 11d93af89a4e11c2bbcef22288526ed5a33d8b71
 SHA512:
-  metadata.gz: bb3798aed413b710d9a2161dd81c896a299f67fe302d87f8470f508961d453907e3f4424e0a4cdbd2039f482754ebeaaa22badf304513b84761f15f05a97d432
-  data.tar.gz: 4d1e8c3717861db095e2dec9d925d17039a5df09a0a053252ab716c84c2595786d269f92c4aa5170aadcf4219fdf35c2f8b41b54a48e48c380e0781817889e22
+  metadata.gz: 3289ea853a8e50f5f848aed1185a12e664c6e09ad1641122a33503d05e8084e47d63b224b157a2080a2659d7a633c56ade149e5435c612af971b790ea5b90887
+  data.tar.gz: 6853b8ace7855d16ef49219cc12b53cbd1498b6e89180441936f55bcdbd9daf2714d3fac8c4207ba6fc366030f438ab95465bedf322a64d9677d74bdb4d36ef0

data/README.md

@@ -24,8 +24,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--enable-migration-comments` option ([migration_comments](https://github.com/pinnymz/migration_comments) is required)
   * Fix rails version `< 4.2.0`
 * `>= 0.5.2`
-  * Add `--enable-mysql-awesome` option ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required)
-  * It is not possible to enable both `--enable-migration-comments` and `--enable-mysql-awesome`
+  * Add `--enable-mysql-awesome` option ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required `>= 0.0.3`)
+  * It is not possible to enable both `--enable-mysql-awesome` and --enable-migration-comments`, `--enable-mysql-awesome` and --enable-mysql-unsigned`, `--enable-mysql-awesome` and --enable-mysql-pkdump`
   * Fix foreigner version `<= 1.7.1`
 
 ## Installation
@@ -193,7 +193,7 @@ create_table "articles", force: true, options: "ENGINE=InnoDB DEFAULT CHARSET=ut
   t.text     "text",       null: false,  collation: "utf8mb4_bin"
   t.datetime "created_at"
   t.datetime "updated_at"
-endend
+end
 ```
 
 ## bigint support

data/bin/ridgepole

@@ -120,6 +120,8 @@ ARGV.options do |opt|
         raise "It is not possible to enable both `--enable-mysql-awesome` and `--enable-migration-comments`"
       elsif options[:enable_mysql_unsigned]
         raise "It is not possible to enable both `--enable-mysql-awesome` and `--enable-mysql-unsigned`"
+      elsif options[:enable_mysql_pkdump]
+        raise "It is not possible to enable both `--enable-mysql-awesome` and `--enable-mysql-pkdump`"
       end
     end
   rescue => e

data/lib/ridgepole/ext/mysql_awesome.rb

@@ -1,8 +1,8 @@
-require 'active_record/connection_adapters/abstract/schema_definitions'
-
 # XXX: https://github.com/waka/activerecord-mysql-unsigned/blob/v0.3.1/lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_definitions.rb#L14
 class ActiveRecord::ConnectionAdapters::TableDefinition
+  alias primary_key_without_unsigned primary_key
+
   def primary_key(name, type = :primary_key, options = {})
-    column(name, type, options.merge(primary_key: true).reverse_merge(unsigned: true))
+    primary_key_without_unsigned(name, type, options.merge(primary_key: true).reverse_merge(unsigned: true))
   end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.5.2.beta4'
+  VERSION = '0.5.2.beta5'
 end

data/ridgepole.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'foreigner', '<= 1.7.1'
   spec.add_development_dependency 'activerecord-mysql-pkdump', '>= 0.1.0'
   spec.add_development_dependency 'migration_comments'
-  spec.add_development_dependency 'activerecord-mysql-awesome'
+  spec.add_development_dependency 'activerecord-mysql-awesome', '>= 0.0.3'
 end

data/spec/bigint_pk/bigint_pkspec.rb

@@ -1,6 +1,6 @@
 if mysql_awesome_enabled?
   describe 'Ridgepole::Client (with bigint pk)' do
-    let(:dsl) {
+    let(:dsl1) {
       <<-RUBY
         create_table "books", id: :primary_key, limit: 8, force: true do |t|
           t.string   "title",      null: false
@@ -11,13 +11,36 @@ if mysql_awesome_enabled?
       RUBY
     }
 
-    context 'when dump with activerecord-mysql-pkdump' do
+    let(:dsl2) {
+      <<-RUBY
+        create_table "books", id: :bigint, force: true do |t|
+          t.string   "title",      null: false
+          t.integer  "author_id",  null: false
+          t.datetime "created_at"
+          t.datetime "updated_at"
+        end
+      RUBY
+    }
+
+    context 'when with limit:8' do
+      subject { client }
+
+      before { subject.diff(dsl1).migrate }
+
+      it {
+        expect(show_create_table(:books)).to include '`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT'
+        expect(subject.dump).to eq dsl2.strip_heredoc.strip
+      }
+    end
+
+    context 'when with id:bigint' do
       subject { client }
 
-      before { subject.diff(dsl).migrate }
+      before { subject.diff(dsl2).migrate }
 
       it {
         expect(show_create_table(:books)).to include '`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT'
+        expect(subject.dump).to eq dsl2.strip_heredoc.strip
       }
     end
   end

data/spec/dump/dump_class_method_spec.rb

@@ -24,7 +24,7 @@ describe 'Ridgepole::Client.dump' do
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no", force: true do |t|
+        create_table "departments", primary_key: "dept_no",#{mysql_awesome_enabled? ? ' id: :string, limit: 4,' : ''} force: true do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -57,7 +57,7 @@ describe 'Ridgepole::Client.dump' do
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no", force: true do |t|
+        create_table "employees", primary_key: "emp_no",#{mysql_awesome_enabled? ? ' id: :integer,' : ''} 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

data/spec/dump/dump_some_tables_spec.rb

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
-        create_table "employees", primary_key: "emp_no", force: true do |t|
+        create_table "employees", primary_key: "emp_no",#{mysql_awesome_enabled? ? ' id: :integer,' : ''} 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
@@ -40,7 +40,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
-        create_table "employees", primary_key: "emp_no", force: true do |t|
+        create_table "employees", primary_key: "emp_no",#{mysql_awesome_enabled? ? ' id: :integer,' : ''} 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

data/spec/dump/dump_spec.rb

@@ -11,7 +11,7 @@ describe 'Ridgepole::Client#dump' do
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no", force: true do |t|
+        create_table "departments", primary_key: "dept_no",#{mysql_awesome_enabled? ? ' id: :string, limit: 4,' : ''} force: true do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -44,7 +44,7 @@ describe 'Ridgepole::Client#dump' do
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no", force: true do |t|
+        create_table "employees", primary_key: "emp_no",#{mysql_awesome_enabled? ? ' id: :integer,' : ''} 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

data/spec/migrate/migrate_same_spec.rb

@@ -8,7 +8,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no", force: true do |t|
+        create_table "departments", primary_key: "dept_no",#{mysql_awesome_enabled? ? ' id: :string, limit: 4,' : ''} force: true do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -41,7 +41,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no", force: true do |t|
+        create_table "employees", primary_key: "emp_no",#{mysql_awesome_enabled? ? ' id: :integer,' : ''} 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

data/spec/~pkdump/pkdump_spec.rb

@@ -1,65 +1,67 @@
-describe 'Ridgepole::Client (with pkdump)' do
-  let(:dsl) {
-    <<-RUBY
-      create_table "authors", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
-        t.string   "name",       null: false
-        t.datetime "created_at"
-        t.datetime "updated_at"
-      end
+unless mysql_awesome_enabled?
+  describe 'Ridgepole::Client (with pkdump)' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "authors", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
+          t.string   "name",       null: false
+          t.datetime "created_at"
+          t.datetime "updated_at"
+        end
 
-      create_table "books", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
-        t.string   "title",      null: false
-        t.integer  "author_id",  null: false
-        t.datetime "created_at"
-        t.datetime "updated_at"
-      end
-    RUBY
-  }
+        create_table "books", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
+          t.string   "title",      null: false
+          t.integer  "author_id",  null: false
+          t.datetime "created_at"
+          t.datetime "updated_at"
+        end
+      RUBY
+    }
 
-  context 'when dump with activerecord-mysql-pkdump' do
-    subject { client(enable_mysql_pkdump: true) }
+    context 'when dump with activerecord-mysql-pkdump' do
+      subject { client(enable_mysql_pkdump: true) }
 
-    before { subject.diff(dsl).migrate }
+      before { subject.diff(dsl).migrate }
 
-    it {
-      expect(subject.dump).to eq dsl.strip_heredoc.strip
-    }
-  end
+      it {
+        expect(subject.dump).to eq dsl.strip_heredoc.strip
+      }
+    end
 
-  context 'when create with activerecord-mysql-pkdump' do
-    subject { client(enable_mysql_pkdump: true) }
+    context 'when create with activerecord-mysql-pkdump' do
+      subject { client(enable_mysql_pkdump: true) }
 
-    it {
-      delta = subject.diff(dsl)
-      expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq ''
-      delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
-    }
-  end
+      it {
+        delta = subject.diff(dsl)
+        expect(delta.differ?).to be_truthy
+        expect(subject.dump.delete_empty_lines).to eq ''
+        delta.migrate
+        expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+      }
+    end
 
-  context 'update create with activerecord-mysql-pkdump' do
-    subject { client(enable_mysql_pkdump: true) }
+    context 'update create with activerecord-mysql-pkdump' do
+      subject { client(enable_mysql_pkdump: true) }
 
-    before { subject.diff(dsl).migrate }
+      before { subject.diff(dsl).migrate }
 
-    let(:dsl2) {
-      <<-RUBY
-        create_table "books", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
-          t.string   "title2",     null: false
-          t.integer  "author_id",  null: false
-          t.datetime "created_at"
-          t.datetime "updated_at"
-        end
-      RUBY
-    }
+      let(:dsl2) {
+        <<-RUBY
+          create_table "books", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
+            t.string   "title2",     null: false
+            t.integer  "author_id",  null: false
+            t.datetime "created_at"
+            t.datetime "updated_at"
+          end
+        RUBY
+      }
 
-    it {
-      delta = subject.diff(dsl2)
-      expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
-      delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq dsl2.strip_heredoc.strip.delete_empty_lines
-    }
+      it {
+        delta = subject.diff(dsl2)
+        expect(delta.differ?).to be_truthy
+        expect(subject.dump.delete_empty_lines).to eq dsl.strip_heredoc.strip.delete_empty_lines
+        delta.migrate
+        expect(subject.dump.delete_empty_lines).to eq dsl2.strip_heredoc.strip.delete_empty_lines
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.5.2.beta4
+  version: 0.5.2.beta5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email: