update latest AR 4.0 (master) - need table_definition tweaks due API change

Author: kares

gemfiles/rails40.gemfile.lock

@@ -1,18 +1,18 @@
 GIT
   remote: git://github.com/rails/activerecord-deprecated_finders.git
-  revision: c00788c2b7e01170f63bd9651f7efd8deb4bd4b0
+  revision: 46aa99efc9c3c1db1d4f2e55373481212e6b2e26
   specs:
     activerecord-deprecated_finders (0.0.3)
 
 GIT
   remote: git://github.com/rails/journey.git
-  revision: e64274443f8420df2518cf2206a2c640d9d8e196
+  revision: f0938d664286dc0b47f13092fa5d04a9225038d4
   specs:
     journey (2.0.0.20120723141804)
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 70d0537d5550958d7e006787de869ce9046101fc
+  revision: 817e8fad5a84569729ae65fbd713274678c68d8f
   specs:
     actionmailer (4.0.0.beta1)
       actionpack (= 4.0.0.beta1)
@@ -36,7 +36,7 @@ GIT
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.33)
+      tzinfo (~> 0.3.37)
     rails (4.0.0.beta1)
       actionmailer (= 4.0.0.beta1)
       actionpack (= 4.0.0.beta1)
@@ -49,48 +49,45 @@ GIT
       actionpack (= 4.0.0.beta1)
       activesupport (= 4.0.0.beta1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.17.0, < 2.0)
+      thor (>= 0.18.1, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (4.0.0.beta2)
-    atomic (1.0.1-java)
+    atomic (1.1.6-java)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     builder (3.1.4)
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.2)
     i18n (0.6.4)
     jruby-openssl (0.8.7)
       bouncy-castle-java (>= 1.5.0147)
-    json (1.7.7-java)
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.21)
+    mime-types (1.22)
     minitest (4.7.0)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.1)
+    multi_json (1.7.2)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rake (10.0.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.9.0)
+    sprockets (2.9.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -102,7 +99,7 @@ GEM
     test-unit (2.5.4)
     test-unit-context (0.3.0)
       test-unit (>= 2.4.0)
-    thor (0.17.0)
+    thor (0.18.1)
     thread_safe (0.1.0)
       atomic
     tilt (1.3.6)

lib/arjdbc/db2/adapter.rb

@@ -183,8 +183,8 @@ def xml(*args)
       end
     end
 
-    def table_definition
-      TableDefinition.new(self)
+    def table_definition(*args)
+      new_table_definition(TableDefinition, *args)
     end
 
     def prefetch_primary_key?(table_name = nil)
@@ -254,7 +254,8 @@ def create_table(name, options = {}) #:nodoc:
     end
 
     def zos_create_table(name, options = {}) # :nodoc:
-      table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
+      # NOTE: this won't work for 4.0 - need to pass different initialize args :
+      table_definition = TableDefinition.new(self)
       unless options[:id] == false
         table_definition.primary_key(options[:primary_key] || primary_key(name))
       end

lib/arjdbc/derby/adapter.rb

@@ -149,8 +149,8 @@ def xml(*args)
 
     end
 
-    def table_definition
-      TableDefinition.new(self)
+    def table_definition(*args)
+      new_table_definition(TableDefinition, *args)
     end
 
     # Override default -- fix case where ActiveRecord passes :default => nil, :null => true

lib/arjdbc/jdbc/adapter.rb

@@ -258,6 +258,7 @@ def exec_update(sql, name, binds) # :nodoc:
         do_exec(sql, name, binds, :update)
       end
 
+      # TODO is it really useful to have do_exec now ?!
       def do_exec(sql, name, binds, type)
         sql = to_sql(sql, binds)
         log(sql, name || 'SQL') do
@@ -443,17 +444,36 @@ def last_inserted_id(result)
         result
       end
 
+      # Helper to handle 3.x/4.0 uniformly override #table_definition as :
+      # 
+      #   def table_definition(*args)
+      #     new_table_definition(TableDefinition, *args)
+      #   end
+      #
+      def new_table_definition(table_definition, *args)
+        table_definition.new(self) # args ignored only used for 4.0
+      end
+      private :new_table_definition
+      
       # if adapter overrides #table_definition it works on 3.x as well as 4.0
       if ActiveRecord::VERSION::MAJOR > 3
 
+      # aliasing #create_table_definition as #table_definition :
       alias table_definition create_table_definition
 
-      def create_table_definition
-        table_definition
+      # TableDefinition.new native_database_types, name, temporary, options
+      def create_table_definition(name, temporary, options)
+        table_definition(name, temporary, options)
       end
-        
+      
+      # arguments expected: (name, temporary, options)
+      def new_table_definition(table_definition, *args)
+        table_definition.new native_database_types, *args
       end
+      private :new_table_definition
 
+      end
+    
       private
 
       # #deprecated no longer used

lib/arjdbc/oracle/adapter.rb

@@ -149,9 +149,9 @@ def xml(*args)
         column(args[0], 'xml', options)
       end
     end
-
-    def table_definition
-      TableDefinition.new(self)
+    
+    def table_definition(*args)
+      new_table_definition(TableDefinition, *args)
     end
 
     def self.arel2_visitors(config)

lib/arjdbc/postgresql/adapter.rb

@@ -1521,8 +1521,8 @@ def column(name, type = nil, options = {})
 
       if ActiveRecord::VERSION::MAJOR > 3
 
-        def create_column_definition(base, name, type)
-          ColumnDefinition.new base, name, type
+        def create_column_definition(name, type)
+          ColumnDefinition.new name, type
         end
 
       else # no #create_column_definition on 3.2
@@ -1538,25 +1538,17 @@ def new_column_definition(base, name, type)
 
     end
 
+    def table_definition(*args)
+      new_table_definition(TableDefinition, *args)
+    end
+    
     class Table < ActiveRecord::ConnectionAdapters::Table
       include ColumnMethods
     end
 
-    def table_definition
-      TableDefinition.new(self)
-    end
-    
-    if ActiveRecord::VERSION::MAJOR > 3
-      
-      #def create_table_definition
-      #  TableDefinition.new(self)
-      #end
-
-      def update_table_definition(table_name, base)
-        Table.new(table_name, base)
-      end
-      
-    end
+    def update_table_definition(table_name, base)
+      Table.new(table_name, base)
+    end if ActiveRecord::VERSION::MAJOR > 3
 
     def jdbc_connection_class(spec)
       ::ArJdbc::PostgreSQL.jdbc_connection_class