ridgepole 0.6.0.beta4 → 0.6.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1b762a10fbde926c1087d0908416e96c3c10ed
-  data.tar.gz: b0e1bce4be3f05dbfe958baae95f81c6b5f5bbc0
+  metadata.gz: a35d445a5a8f6d0916949a9c293d749ada5c8e4a
+  data.tar.gz: c1f9977f87611fcd14d1f3ea08e8b25c4fd0f891
 SHA512:
-  metadata.gz: 8a39a465ca7cdbf447b68fc16a4bcc6a8c4adcbe49861244ebad89766ed298f7a5bd106a54dee5872de30c04f45e0e78a83a41fceab4e0415473fa2ca37fe6fd
-  data.tar.gz: ec19f3aee132852785a6c3198b36212c617e17d3c54c98c2286db13567edc3a12031419c0535c19e582800f4d48cff460c0faf6a221362879a6475bb63b0e089
+  metadata.gz: e997a7af8390461cc35f9222fb0d153cd7a406634f27f5747c574076a8cf616587ba3a136594edc1fb678fd7c8b0b97013ce9c2f83027983de497872a2a95ec5
+  data.tar.gz: a03173968378ff62b6ed0460f42ac7432a4764faba1d0a7793e7f62697035fc7fa8feaa70d38c9be47a3328929b17fb404fbb5b0933b948d5ad87c9689f81d9d

data/README.md

@@ -35,6 +35,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
     * foreigner
   * Disable sqlite support
   * Add PostgreSQL test
+  * Remove `--mysql-awesome-unsigned-pk` option
 
 ## Installation
 
@@ -79,7 +80,6 @@ Usage: ridgepole [options]
     -t, --tables TABLES
         --ignore-tables TABLES
         --enable-mysql-awesome
-        --mysql-awesome-unsigned-pk
         --dump-without-table-options
         --index-removed-drop-column
     -r, --require LIBS

data/bin/ridgepole

@@ -105,7 +105,6 @@ ARGV.options do |opt|
     opt.on('-t', '--tables TABLES', Array)        {|v| options[:tables] = v                                 }
     opt.on('',   '--ignore-tables TABLES', Array) {|v| options[:ignore_tables] = v.map {|i| Regexp.new(i) } }
     opt.on('',   '--enable-mysql-awesome')        {    options[:enable_mysql_awesome] = true                }
-    opt.on('',   '--mysql-awesome-unsigned-pk')   {    options[:mysql_awesome_unsigned_pk] = true           }
     opt.on('',   '--dump-without-table-options')  {    options[:dump_without_table_options] = true          }
     opt.on('',   '--index-removed-drop-column')   {    options[:index_removed_drop_column] = true           }
     opt.on('-r'  , '--require LIBS', Array)       {|v| v.each {|i| require i }                              }

data/lib/ridgepole/client.rb

@@ -16,10 +16,6 @@ class Ridgepole::Client
 
     if @options[:enable_mysql_awesome]
       require 'activerecord/mysql/awesome/base'
-
-      if @options[:mysql_awesome_unsigned_pk]
-        require 'ridgepole/ext/mysql_awesome.rb'
-      end
     end
   end
 

data/lib/ridgepole/version.rb

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

data/spec/mysql/cli/ridgepole_spec.rb

@@ -36,7 +36,6 @@ describe 'ridgepole' do
         -t, --tables TABLES
             --ignore-tables TABLES
             --enable-mysql-awesome
-            --mysql-awesome-unsigned-pk
             --dump-without-table-options
             --index-removed-drop-column
         -r, --require LIBS

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -10,7 +10,6 @@ describe 'Ridgepole::Client.dump' do
       if mysql_awesome_enabled?
         opts[:enable_mysql_awesome] = true
         opts[:dump_without_table_options] = true
-        opts[:mysql_awesome_unsigned_pk] = true
       else
         opts[:enable_mysql_unsigned] = true
       end

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -7,7 +7,7 @@ create_table "parent", force: :cascade do |t|
 end
 
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id"#{unsigned_if_enabled}
+  t.integer "parent_id"
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
@@ -18,13 +18,13 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
 
     let(:sorted_actual_dsl) {
       <<-RUBY
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
+create_table "child", force: :cascade do |t|
+  t.integer "parent_id", limit: 4
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
@@ -33,13 +33,13 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
 
     let(:expected_dsl) {
       <<-RUBY
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
+create_table "child", force: :cascade do |t|
+  t.integer "parent_id", limit: 4
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -60,7 +60,7 @@ create_table "parent", force: :cascade do |t|
 end
 
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
+  t.integer "parent_id"
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
@@ -72,13 +72,13 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     let(:sorted_dsl) {
       <<-RUBY
 
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
+create_table "child", force: :cascade do |t|
+  t.integer "parent_id", limit: 4
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -3,11 +3,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
       <<-RUBY
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", force: :cascade do |t|
 end
 
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id"#{unsigned_if_enabled}
+create_table "child", force: :cascade do |t|
+  t.integer "parent_id"
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
@@ -25,13 +25,13 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
     let(:expected_dsl) {
       <<-RUBY
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
+create_table "child", force: :cascade do |t|
+  t.integer "parent_id", limit: 4
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", force: :cascade do |t|
 end
       RUBY
     }
@@ -75,7 +75,7 @@ end
 
 
 create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
+  t.integer "parent_id"
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
@@ -86,13 +86,13 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
 
     let(:sorted_dsl) {
       <<-RUBY
-create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
-  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
+create_table "child", force: :cascade do |t|
+  t.integer "parent_id", limit: 4
 end
 
 add_index "child", ["parent_id"], name: "par_id", using: :btree
 
-create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
+create_table "parent", force: :cascade do |t|
 end
 
 add_foreign_key "child", "parent", name: "child_ibfk_1"

data/spec/mysql/migrate/migrate_execute_spec.rb

@@ -75,13 +75,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when not execute' do
     let(:dsl) {
       <<-RUBY
-        create_table "authors"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "authors", force: :cascade do |t|
           t.string "name", limit: 255, null: false
         end
 
-        create_table "books"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "books", force: :cascade do |t|
           t.string  "title",     limit: 255, null: false
-          t.integer "author_id", limit: 4,   null: false#{unsigned_if_enabled}
+          t.integer "author_id", limit: 4,   null: false
         end
 
         add_index "books", ["author_id"], name: "idx_author_id", using: :btree
@@ -97,7 +97,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "books", force: :cascade do |t|
           t.string  "title",                     null: false
-          t.integer "author_id", limit: 4,   null: false#{unsigned_if_enabled}
+          t.integer "author_id", limit: 4,   null: false
         end
 
         add_index "books", ["author_id"], name: "idx_author_id", using: :btree
@@ -120,9 +120,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
         CREATE TABLE `books` (
-          `id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
           KEY `idx_author_id` (`author_id`) USING BTREE,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
@@ -135,9 +135,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
         CREATE TABLE `books` (
-          `id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
           KEY `idx_author_id` (`author_id`) USING BTREE,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
@@ -220,13 +220,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when not execute (noop)' do
     let(:dsl) {
       <<-RUBY
-        create_table "authors"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "authors", force: :cascade do |t|
           t.string "name", limit: 255, null: false
         end
 
-        create_table "books"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "books", force: :cascade do |t|
           t.string  "title",     limit: 255, null: false
-          t.integer "author_id", limit: 4,   null: false#{unsigned_if_enabled}
+          t.integer "author_id", limit: 4,   null: false
         end
 
         add_index "books", ["author_id"], name: "idx_author_id", using: :btree
@@ -242,7 +242,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "books", force: :cascade do |t|
           t.string  "title",                     null: false
-          t.integer "author_id", limit: 4,   null: false#{unsigned_if_enabled}
+          t.integer "author_id", limit: 4,   null: false
         end
 
         add_index "books", ["author_id"], name: "idx_author_id", using: :btree
@@ -265,9 +265,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
         CREATE TABLE `books` (
-          `id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
           KEY `idx_author_id` (`author_id`) USING BTREE,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)
@@ -282,9 +282,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(show_create_table(:books).strip).to eq <<-SQL.strip_heredoc.strip
         CREATE TABLE `books` (
-          `id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL AUTO_INCREMENT,
+          `id` int(11) NOT NULL AUTO_INCREMENT,
           `title` varchar(255) NOT NULL,
-          `author_id` #{if_mysql_awesome_enabled('int(10) unsigned', 'int(11)')} NOT NULL,
+          `author_id` int(11) NOT NULL,
           PRIMARY KEY (`id`),
           KEY `idx_author_id` (`author_id`) USING BTREE,
           CONSTRAINT `fk_author` FOREIGN KEY (`author_id`) REFERENCES `authors` (`id`)

data/spec/mysql/migrate/migrate_noop_spec.rb

@@ -83,9 +83,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       sql = sql.each_line.map {|i| i.strip }.join("\n")
 
       expect(sql).to eq <<-SQL.strip_heredoc.strip
-        CREATE TABLE `clubs` (`id` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `clubs` (`id` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
-        CREATE TABLE `departments` (`dept_no` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `departments` (`dept_no` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `dept_name` USING btree ON `departments` (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `dept_no` USING btree ON `dept_emp` (`dept_no`)
@@ -93,9 +93,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
         CREATE TABLE `dept_manager` (`dept_no` varchar(4) NOT NULL, `emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `dept_no` USING btree ON `dept_manager` (`dept_no`)
         CREATE  INDEX `emp_no` USING btree ON `dept_manager` (`emp_no`)
-        CREATE TABLE `employee_clubs` (`id` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `emp_no` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL, `club_id` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `employee_clubs` (`id` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `emp_no` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL, `club_id` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `idx_emp_no_club_id` USING btree ON `employee_clubs` (`emp_no`, `club_id`)
-        CREATE TABLE `employees` (`emp_no` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `employees` (`emp_no` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) ENGINE=InnoDB
         CREATE TABLE `salaries` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `salary` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`emp_no`)
         CREATE TABLE `titles` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) ENGINE=InnoDB
@@ -113,17 +113,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       sql = sql.each_line.map {|i| i.strip }.join("\n")
 
       expect(sql).to eq <<-SQL.strip_heredoc.strip
-        CREATE TABLE `clubs` (`id` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `clubs` (`id` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
         ALTER TABLE `clubs` ADD UNIQUE INDEX idx_name (`name`)
-        CREATE TABLE `departments` (`dept_no` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `departments` (`dept_no` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
         ALTER TABLE `departments` ADD UNIQUE INDEX dept_name (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         ALTER TABLE `dept_emp` ADD  INDEX dept_no (`dept_no`), ADD  INDEX emp_no (`emp_no`)
         CREATE TABLE `dept_manager` (`dept_no` varchar(4) NOT NULL, `emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         ALTER TABLE `dept_manager` ADD  INDEX dept_no (`dept_no`), ADD  INDEX emp_no (`emp_no`)
-        CREATE TABLE `employee_clubs` (`id` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `emp_no` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL, `club_id` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `employee_clubs` (`id` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `emp_no` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL, `club_id` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL) ENGINE=InnoDB
         ALTER TABLE `employee_clubs` ADD  INDEX idx_emp_no_club_id (`emp_no`, `club_id`)
-        CREATE TABLE `employees` (`emp_no` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `employees` (`emp_no` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) ENGINE=InnoDB
         CREATE TABLE `salaries` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `salary` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         ALTER TABLE `salaries` ADD  INDEX emp_no (`emp_no`)
         CREATE TABLE `titles` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) ENGINE=InnoDB
@@ -215,9 +215,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       sql = sql.each_line.map {|i| i.strip }.join("\n")
 
       expect(sql).to eq <<-SQL.strip_heredoc.strip
-        CREATE TABLE `clubs` (`id` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `clubs` (`id` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `name` varchar(255) DEFAULT '' NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
-        CREATE TABLE `departments` (`dept_no` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `departments` (`dept_no` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `dept_name` varchar(40) NOT NULL) ENGINE=InnoDB
         CREATE UNIQUE INDEX `dept_name` USING btree ON `departments` (`dept_name`)
         CREATE TABLE `dept_emp` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `dept_no` varchar(4) NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `dept_no` USING btree ON `dept_emp` (`dept_no`)
@@ -225,9 +225,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
         CREATE TABLE `dept_manager` (`dept_no` varchar(4) NOT NULL, `emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `dept_no` USING btree ON `dept_manager` (`dept_no`)
         CREATE  INDEX `emp_no` USING btree ON `dept_manager` (`emp_no`)
-        CREATE TABLE `employee_clubs` (`id` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `emp_no` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL, `club_id` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `employee_clubs` (`id` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `emp_no` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL, `club_id` #{if_mysql_awesome_enabled('int unsigned', 'int(11)')} NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `idx_emp_no_club_id` USING btree ON `employee_clubs` (`emp_no`, `club_id`)
-        CREATE TABLE `employees` (`emp_no` #{if_mysql_awesome_enabled('int unsigned PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) ENGINE=InnoDB
+        CREATE TABLE `employees` (`emp_no` #{if_mysql_awesome_enabled('int PRIMARY KEY AUTO_INCREMENT', 'int(11) auto_increment PRIMARY KEY')}, `birth_date` date NOT NULL, `first_name` varchar(14) NOT NULL, `last_name` varchar(16) NOT NULL, `gender` varchar(1) NOT NULL, `hire_date` date NOT NULL) ENGINE=InnoDB
         CREATE TABLE `salaries` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `salary` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `from_date` date NOT NULL, `to_date` date NOT NULL) ENGINE=InnoDB
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`emp_no`)
         CREATE TABLE `titles` (`emp_no` #{if_mysql_awesome_enabled('int', 'int(11)')} NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) ENGINE=InnoDB

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

@@ -45,7 +45,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        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
           t.string "last_name",  limit: 16, null: false
@@ -112,7 +112,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:before_dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        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
           t.string "last_name",  limit: 16, null: false
@@ -124,7 +124,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:after_dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
           t.string "last_name",  limit: 16, null: false

data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb

@@ -37,8 +37,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
 
         create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  null: false#{unsigned_if_enabled}
-          t.integer "club_id", null: false#{unsigned_if_enabled}
+          t.integer "emp_no",  null: false
+          t.integer "club_id", null: false
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
@@ -73,13 +73,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+        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
 
-        create_table "departments", primary_key: "dept_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -105,14 +105,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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"#{unsigned_if_enabled}, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4, null: false#{unsigned_if_enabled}
-          t.integer "club_id", limit: 4, null: false#{unsigned_if_enabled}
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",  limit: 4, null: false
+          t.integer "club_id", limit: 4, null: false
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        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
           t.string "last_name",  limit: 16, null: false

data/spec/mysql/migrate/migrate_with_tables_spec.rb

@@ -45,7 +45,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        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
           t.string "last_name",  limit: 16, null: false
@@ -112,7 +112,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:before_dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        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
           t.string "last_name",  limit: 16, null: false
@@ -124,7 +124,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:after_dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
           t.string "last_name",  limit: 16, null: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta4
+  version: 0.6.0.beta5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -148,7 +148,6 @@ files:
 - lib/ridgepole/dsl_parser.rb
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
-- lib/ridgepole/ext/mysql_awesome.rb
 - lib/ridgepole/logger.rb
 - lib/ridgepole/migration_ext.rb
 - lib/ridgepole/schema_dumper_ext.rb

data/lib/ridgepole/ext/mysql_awesome.rb

@@ -1,12 +0,0 @@
-# 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 = {})
-    if options.has_key?(:id)
-      primary_key_without_unsigned(name, type, options)
-    else
-      primary_key_without_unsigned(name, type, options.merge(primary_key: true).reverse_merge(unsigned: true))
-    end
-  end
-end