connection_manager 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzU2NjFmOWFjMzZiMmEzOTNmNjJmNjg4ZTQxYjZkYzNlNWJjYWRkZQ==
+    NjMyYTlkY2I0ZmFlNTI5ZDc1OGIyY2I1ZDUyZmQ3NTZhMTZmYzg3NQ==
   data.tar.gz: !binary |-
-    N2E5YzYzZTI5Y2NkYTI3ZDRmNDMwODA0N2MwNThmYzg2YmNmOWE0OQ==
+    NWQzNjkxN2UxODYyNmQyNjllYmIwMWRhYzYzYjUwYmMyMmE1NTg5YQ==
 SHA512:
   metadata.gz: !binary |-
-    NGVhNzFmMDRmOWQ3MDM2YmEwOGIwMTQzOTc1MzRlNzIyMmMxOGMwNWE4ZjFi
-    NmUxZGEyZjgwM2NmYThmYjdlN2E3N2IyNGI0OTFmZDljYTAzMDhiM2YyZWMz
-    MDNkODYwMWJlYWQxYzM5OTc1MTc2MzJlMGVkZjU4OWEwZGZlZjE=
+    MmMyNTdiZjg0NmIwMDYxNTkzNzg5MjQ0MjYwNDdjOWZjNTIxYzQ4Yzg0MDgw
+    OGNkODg1ZGE4NGU0OTQ0ZWFiNTUxMzY2MjA2ZmE0YzRjOGU0N2U1ZDEwMTQ0
+    YmZhZGY3NzBmNDUwODlhZjM4M2RkNTBhMTk1ZjM3NzM4YmYzYTk=
   data.tar.gz: !binary |-
-    NGFhMTMwZDk3NGI3OGNiMGQ5ODhiZGEyNGFhNDk4ZDBmOTMyNTg1YmJhNjRi
-    NjFkZTg3Njk4ZmU5NDczODBmZmUxNDQ0NjI0MTc2ZjNkNGIyZWUxMjFlODlj
-    Mzc5ODc2YWRmNzg1ZmMxNWY1ZmViNTlkYmVhZDU2MmJlYzViNzU=
+    MTk0NTg1MDViZjM0MmUyYjhmY2YzZDQ1YzRmOTkwNTFlZDAyYThkY2UzNWU1
+    YjVjMGFkNTU4MDBiZTRhMTFjMTA4YWJhZWY0YWVjMDk0Nzc0NzEyOTJlOTRl
+    Zjk3N2Q2M2JlNDA3YmVmNGQxYjNiMzcxYmQxN2MzN2Q4ZGQwMDM=

data/lib/connection_manager/using.rb

@@ -63,6 +63,61 @@ module ConnectionManager
         @klass.parent
       end
 
+      if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+        # Rails 3.0
+        def find_by_sql(sql)
+          connection.select_all(sanitize_sql(sql), "#{name} Load").collect! { |record| instantiate(record) }
+        end
+        
+      elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
+        # Rails 3.1
+        def find_by_sql(sql, binds = [])
+          connection.select_all(sanitize_sql(sql), "#{name} Load", binds).collect! { |record| instantiate(record) }
+        end
+
+      elsif ActiveRecord::VERSION::MAJOR == 3
+        # Rails 3.2
+        def find_by_sql(sql, binds = [])
+          logging_query_plan do
+            connection.select_all(sanitize_sql(sql), "#{name} Load", binds).collect! { |record| instantiate(record) }
+          end
+        end
+
+      elsif ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR <= 1
+        #Rails 4.0 & 4.1
+        def find_by_sql(sql, binds = [])
+          result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds)
+          column_types = {}
+          if result_set.respond_to? :column_types
+            column_types = result_set.column_types
+          else
+            ActiveSupport::Deprecation.warn "the object returned from `select_all` must respond to `column_types`"
+          end
+          result_set.map { |record| instantiate(record, column_types) }
+        end
+
+      else
+        # Edge Rails
+        def find_by_sql(sql, binds = [])
+          result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds)
+          column_types = result_set.column_types.dup
+          columns_hash.each_key { |k| column_types.delete k }
+          message_bus = ActiveSupport::Notifications.instrumenter
+          payload = {
+            record_count: result_set.length,
+            class_name: name
+          }
+          message_bus.instrument('instantiation.active_record', payload) do
+            result_set.map { |record| instantiate(record, column_types) }
+          end
+        end
+      end
+
+      def count_by_sql(sql)
+        sql = sanitize_conditions(sql)
+        connection.select_value(sql, "#{name} Count").to_i
+      end
+
       # Pass all methods to @klass, this ensures objects
       # build from the query are the correct class and
       # any settings in the model like table_name_prefix

data/lib/connection_manager/version.rb

@@ -1,3 +1,3 @@
 module ConnectionManager
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: connection_manager
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Cross-schema, replication and mutli-DMS gem for ActiveRecord.