connection_manager 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -1,47 +1,47 @@
 PATH
   remote: .
   specs:
-    connection_manager (0.2.4)
+    connection_manager (0.2.5)
       activerecord (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.2)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    ZenTest (4.7.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.2)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     builder (3.0.0)
     diff-lcs (1.1.3)
-    factory_girl (2.3.2)
-      activesupport
+    factory_girl (3.2.0)
+      activesupport (>= 3.0.0)
     i18n (0.6.0)
     metaclass (0.0.1)
-    mocha (0.10.0)
+    mocha (0.11.3)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
+    multi_json (1.3.2)
     mysql2 (0.3.11)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.31)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby

data/lib/connection_manager/cross_schema_patch.rb

@@ -1,128 +1,27 @@
-### https://github.com/rails/rails/issues/539
-### http://tamersalama.com/2010/09/27/nomethoderror-undefined-method-eq-for-nilnilclass/
-### https://github.com/rails/rails/blob/3-0-stable/activerecord/lib/active_record/associations.rb
-# ActiveRecord 3.0 ONLY
+# ActiveRecord 3.0 BACK PORT ONLY
+# https://github.com/brianmario/mysql2/commit/14accdf8d1bf557f652c19b870316094a7441334#diff-0
 
 if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
-
   module ActiveRecord
-    module Associations 
-      module ClassMethods
-        class JoinDependency     
-          class JoinAssociation < JoinBase 
-            
-            def table_name_without_schema(t_name)
-              t_name.to_s.gsub(/.*\./, '')
-            end
-          
-            def association_join
-              return @join if @join
-              aliased_table = Arel::Table.new(table_name.to_s.gsub(/.*\./, ''), :as   => @aliased_table_name.to_s.gsub(/.*\./, ''),
-                :engine  => arel_engine,
-                :columns => klass.columns)
-    
-              parent_table = Arel::Table.new(parent.table_name.to_s.gsub(/.*\./, ''), :as => parent.aliased_table_name.to_s.gsub(/.*\./, ''),
-                :engine  => arel_engine,
-                :columns => parent.active_record.columns)
-              as_conditions = reflection.options[:conditions] && process_conditions(reflection.options[:conditions], aliased_table_name)      
-            
-              @join = case reflection.macro
-            
-              when :has_and_belongs_to_many
-                join_table = Arel::Table.new(options[:join_table], :as => aliased_join_table_name, :engine => arel_engine)
-                fk = options[:foreign_key] || reflection.active_record.to_s.foreign_key
-                klass_fk = options[:association_foreign_key] || klass.to_s.foreign_key
-
-                [
-                  join_table[fk].eq(parent_table[reflection.active_record.primary_key]),
-                  [aliased_table[klass.primary_key].eq(join_table[klass_fk]), as_conditions].reject{ |x| x.blank? }
-                ]
-              when :has_many, :has_one
-                if reflection.options[:through]
-                  join_table = Arel::Table.new(through_reflection.klass.table_name, :as => aliased_join_table_name, :engine => arel_engine)
-                  jt_as_conditions = through_reflection.options[:conditions] && process_conditions(through_reflection.options[:conditions], aliased_table_name)
-                  jt_as_extra = jt_source_extra = jt_sti_extra = nil
-                  first_key = second_key = as_extra = nil
-
-                  if through_reflection.macro == :belongs_to
-                    jt_primary_key = through_reflection.primary_key_name
-                    jt_foreign_key = through_reflection.association_primary_key
-                  else
-                    jt_primary_key = through_reflection.active_record_primary_key
-                    jt_foreign_key = through_reflection.primary_key_name
-
-                    if through_reflection.options[:as] # has_many :through against a polymorphic join
-                      jt_as_extra = join_table[through_reflection.options[:as].to_s + '_type'].eq(parent.active_record.base_class.name)
-                    end
-                  end
-
-                  case source_reflection.macro
-                  when :has_many, :has_one
-                    if source_reflection.options[:as]
-                      first_key   = "#{source_reflection.options[:as]}_id"
-                      second_key  = options[:foreign_key] || primary_key
-                      as_extra    = aliased_table["#{source_reflection.options[:as]}_type"].eq(source_reflection.active_record.base_class.name)
-                    else
-                      first_key   = through_reflection.klass.base_class.to_s.foreign_key
-                      second_key  = options[:foreign_key] || primary_key
-                    end
-
-                    unless through_reflection.klass.descends_from_active_record?
-                      jt_sti_extra = join_table[through_reflection.active_record.inheritance_column].eq(through_reflection.klass.sti_name)
-                    end
-                  when :belongs_to
-                    first_key = primary_key
-                    if reflection.options[:source_type]
-                      second_key = source_reflection.association_foreign_key
-                      jt_source_extra = join_table[reflection.source_reflection.options[:foreign_type]].eq(reflection.options[:source_type])
-                    else
-                      second_key = source_reflection.primary_key_name
-                    end
-                  end
-                  [
-                    [parent_table[jt_primary_key].eq(join_table[jt_foreign_key]), jt_as_extra, jt_source_extra, jt_sti_extra, jt_as_conditions].reject{|x| x.blank? },
-                    [aliased_table[first_key].eq(join_table[second_key]), as_extra, as_conditions].reject{ |x| x.blank? }
-                  ]
-                elsif reflection.options[:as]
-                  id_rel = aliased_table["#{reflection.options[:as]}_id"].eq(parent_table[parent.primary_key])
-                  type_rel = aliased_table["#{reflection.options[:as]}_type"].eq(parent.active_record.base_class.name)
-                  [id_rel, type_rel, as_conditions].reject{ |x| x.blank?}
-                else
-                  foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
-                  [aliased_table[foreign_key].eq(parent_table[reflection.options[:primary_key] || parent.primary_key]), as_conditions].reject{ |x| x.blank? }
-                end
-              when :belongs_to
-                [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name] || find_belongs_to_arel_column(parent_table)), as_conditions].reject{ |x| x.blank? }
-            
-                #[aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(find_belongs_to_arel_column(parent_table)), as_conditions].reject{ |x| x.blank? }
-           
-              end
-
-              unless klass.descends_from_active_record?
-                sti_column = aliased_table[klass.inheritance_column]
-                sti_condition = sti_column.eq(klass.sti_name)
-                klass.descendants.each {|subclass| sti_condition = sti_condition.or(sti_column.eq(subclass.sti_name)) }
-
-                @join << sti_condition
-              end
-
-              @join
-            end
-
-            def find_belongs_to_arel_column(parent_table)
-              parent_table.columns.select{|c| (c.name == (options[:foreign_key] || reflection.primary_key_name).to_sym)}[0]
-            end
+    module ConnectionAdapters
+      class Mysql2Adapter < AbstractAdapter     
+        def tables(name = nil, database = nil) #:nodoc:
+          sql = ["SHOW TABLES", database].compact.join(' IN ')
+          execute(sql, 'SCHEMA').collect do |field|
+            field.first
           end
         end
-      end
-    end
-  end
-  
-  module Arel
-    class Table
-      private
-      def table_exists?
-        @table_exists ||= tables.key?(@name.to_s.gsub(/.*\./, '')) || engine.connection.table_exists?(name.to_s.gsub(/.*\./, ''))
+      
+        def table_exists?(name)
+          return true if super
+          name          = name.to_s
+          schema, table = name.split('.', 2)
+          unless table # A table was provided without a schema
+            table  = schema
+            schema = nil
+          end
+          tables(nil, schema).include? table
+        end
       end
     end
   end

data/lib/connection_manager/version.rb

@@ -1,4 +1,4 @@
 module ConnectionManager
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70141007740340 !ruby/object:Gem::Requirement
+  requirement: &70098201041480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141007740340
+  version_requirements: *70098201041480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70141007739920 !ruby/object:Gem::Requirement
+  requirement: &70098201041000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141007739920
+  version_requirements: *70098201041000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70141007770420 !ruby/object:Gem::Requirement
+  requirement: &70098201040540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141007770420
+  version_requirements: *70098201040540
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70141007770000 !ruby/object:Gem::Requirement
+  requirement: &70098201040000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141007770000
+  version_requirements: *70098201040000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70141007769580 !ruby/object:Gem::Requirement
+  requirement: &70098201039580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141007769580
+  version_requirements: *70098201039580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70141007769160 !ruby/object:Gem::Requirement
+  requirement: &70098201039100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141007769160
+  version_requirements: *70098201039100
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70141007768740 !ruby/object:Gem::Requirement
+  requirement: &70098201038680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141007768740
+  version_requirements: *70098201038680
 description: Simplifies connecting to Muliple and Replication databases with rails
   and active_record
 email: