data_miner 2.5.1 → 2.5.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.5.2 / 2013-07-05
+
+* Bug fixes
+
+  * Get connection from the right connection pool (namely, the model's, not AR::Base's)
+
 2.5.1 / 2013-03-15
 
 * Enhancements

data/lib/data_miner/attribute.rb

@@ -383,7 +383,7 @@ class DataMiner
 
     def read_units(row)
       if units = row[units_field_name || units_field_number]
-        DataMiner.compress_whitespace(units).underscore.to_sym
+        DataMiner.compress_whitespace(units).underscore
       end
     end
 

data/lib/data_miner/step/import.rb

@@ -102,7 +102,7 @@ class DataMiner
       end
 
       def save_with_upsert
-        c = ActiveRecord::Base.connection_pool.checkout
+        c = model.connection_pool.checkout
         Upsert.stream(c, model.table_name) do |upsert|
           table.each do |row|
             selector = @key ? { @key => attributes[@key].read(row) } : { model.primary_key => nil }
@@ -113,7 +113,7 @@ class DataMiner
             upsert.row selector, document
           end
         end
-        ActiveRecord::Base.connection_pool.checkin c
+        model.connection_pool.checkin c
       end
 
       def save_with_activerecord
@@ -126,7 +126,7 @@ class DataMiner
 
       def table_has_autoincrementing_primary_key?
         return @table_has_autoincrementing_primary_key_query.first if @table_has_autoincrementing_primary_key_query.is_a?(Array)
-        c = ActiveRecord::Base.connection_pool.checkout
+        c = model.connection_pool.checkout
         answer = if (pk = model.primary_key) and model.columns_hash[pk].type == :integer
           case c.adapter_name
           when /mysql/i
@@ -142,7 +142,7 @@ class DataMiner
             true
           end
         end
-        ActiveRecord::Base.connection_pool.checkin c
+        model.connection_pool.checkin c
         @table_has_autoincrementing_primary_key_query = [answer]
         answer
       end

data/lib/data_miner/step/sql.rb

@@ -40,9 +40,7 @@ class DataMiner
       # @private
       def start
         if statement
-          c = ActiveRecord::Base.connection_pool.checkout
-          c.execute statement
-          ActiveRecord::Base.connection_pool.checkin c
+          ActiveRecord::Base.connection.execute statement
         else
           tmp_path = UnixUtils.curl url
           send config[:adapter], tmp_path

data/lib/data_miner/version.rb

@@ -1,3 +1,3 @@
 class DataMiner
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_miner
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm