ridgepole 0.5.3.beta2 → 0.5.3.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb2da59b698d8028a88d187e3bdb51d9a2e1947
-  data.tar.gz: a9f3355b8dac1b03970dfa414d53936813507b0c
+  metadata.gz: 4836232269876c37ac6d3c9bdcf2f1495d4620d4
+  data.tar.gz: f7e856a5c6de4b9ea7ba2e66ac9c9c277e97a2fb
 SHA512:
-  metadata.gz: 73eacc99ba04fd98a0feaf3b648b15dd36ab526792fea0bdada1b1eed7a6406b1adf46e97bdadbfcae159ff2d80ffe45da72b3d37b2b05da198ca1db836ed50e
-  data.tar.gz: d14691d0c2ed17afb698eaa0d5f746316f6d8145ae6c2a65cfda27c440feededc625890af10bc837fdee89568030f11f3635f9c05d7b25395d05031929ccd364
+  metadata.gz: 79e5383609e65c7847ebfcd48c76c86867a3efdb5c0274938febc79cfd73d079952b8738e81e57a3a152221277ad27d84f7b2779b7e5ef0daddbbe0659fd3ec9
+  data.tar.gz: 87232f87adb82294b2218b8b4b112ab10f54d9293208e305c0ae337cbbf6a0120c2caa4d478e656c3e5d3350fba91bdfb77f9e7a44030ceec43128fd26e50455

data/lib/ridgepole/execute_expander.rb

@@ -70,28 +70,31 @@ module ActiveRecord::ConnectionAdapters::SchemaStatements
   alias_method_chain :index_name_exists?, :noop
 end
 
-require 'active_record/connection_adapters/sqlite3_adapter'
+begin
+  require 'active_record/connection_adapters/sqlite3_adapter'
 
-class ActiveRecord::ConnectionAdapters::SQLite3Adapter
-  def exec_query_with_noop(sql, name = nil, binds = [])
-    if Ridgepole::ExecuteExpander.noop
-      if (callback = Ridgepole::ExecuteExpander.callback)
-        callback.call(sql, name)
+  class ActiveRecord::ConnectionAdapters::SQLite3Adapter
+    def exec_query_with_noop(sql, name = nil, binds = [])
+      if Ridgepole::ExecuteExpander.noop
+        if (callback = Ridgepole::ExecuteExpander.callback)
+          callback.call(sql, name)
+        end
+      else
+        exec_query_without_noop(sql, name, binds)
       end
-    else
-      exec_query_without_noop(sql, name, binds)
     end
-  end
-  alias_method_chain :exec_query, :noop
+    alias_method_chain :exec_query, :noop
 
-  def copy_table_with_noop(from, to, options = {})
-    if Ridgepole::ExecuteExpander.noop
-      if (callback = Ridgepole::ExecuteExpander.callback)
-        callback.call("COPY TABLE #{from} TO #{to}")
+    def copy_table_with_noop(from, to, options = {})
+      if Ridgepole::ExecuteExpander.noop
+        if (callback = Ridgepole::ExecuteExpander.callback)
+          callback.call("COPY TABLE #{from} TO #{to}")
+        end
+      else
+        copy_table_without_noop(from, to, options)
       end
-    else
-      copy_table_without_noop(from, to, options)
     end
+    alias_method_chain :copy_table, :noop
   end
-  alias_method_chain :copy_table, :noop
+rescue LoadError
 end

data/lib/ridgepole/ext/mysql_awesome.rb

@@ -3,6 +3,10 @@ class ActiveRecord::ConnectionAdapters::TableDefinition
   alias primary_key_without_unsigned primary_key
 
   def primary_key(name, type = :primary_key, options = {})
-    primary_key_without_unsigned(name, type, options.merge(primary_key: true).reverse_merge(unsigned: true))
+    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

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.5.3.beta2'
+  VERSION = '0.5.3.beta4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.5.3.beta2
+  version: 0.5.3.beta4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord