data_miner 2.5.1 → 2.5.2
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +6 -0
- data/lib/data_miner/attribute.rb +1 -1
- data/lib/data_miner/step/import.rb +4 -4
- data/lib/data_miner/step/sql.rb +1 -3
- data/lib/data_miner/version.rb +1 -1
- metadata +2 -2
data/CHANGELOG
CHANGED
data/lib/data_miner/attribute.rb
CHANGED
@@ -102,7 +102,7 @@ class DataMiner
|
|
102
102
|
end
|
103
103
|
|
104
104
|
def save_with_upsert
|
105
|
-
c =
|
105
|
+
c = model.connection_pool.checkout
|
106
106
|
Upsert.stream(c, model.table_name) do |upsert|
|
107
107
|
table.each do |row|
|
108
108
|
selector = @key ? { @key => attributes[@key].read(row) } : { model.primary_key => nil }
|
@@ -113,7 +113,7 @@ class DataMiner
|
|
113
113
|
upsert.row selector, document
|
114
114
|
end
|
115
115
|
end
|
116
|
-
|
116
|
+
model.connection_pool.checkin c
|
117
117
|
end
|
118
118
|
|
119
119
|
def save_with_activerecord
|
@@ -126,7 +126,7 @@ class DataMiner
|
|
126
126
|
|
127
127
|
def table_has_autoincrementing_primary_key?
|
128
128
|
return @table_has_autoincrementing_primary_key_query.first if @table_has_autoincrementing_primary_key_query.is_a?(Array)
|
129
|
-
c =
|
129
|
+
c = model.connection_pool.checkout
|
130
130
|
answer = if (pk = model.primary_key) and model.columns_hash[pk].type == :integer
|
131
131
|
case c.adapter_name
|
132
132
|
when /mysql/i
|
@@ -142,7 +142,7 @@ class DataMiner
|
|
142
142
|
true
|
143
143
|
end
|
144
144
|
end
|
145
|
-
|
145
|
+
model.connection_pool.checkin c
|
146
146
|
@table_has_autoincrementing_primary_key_query = [answer]
|
147
147
|
answer
|
148
148
|
end
|
data/lib/data_miner/step/sql.rb
CHANGED
@@ -40,9 +40,7 @@ class DataMiner
|
|
40
40
|
# @private
|
41
41
|
def start
|
42
42
|
if statement
|
43
|
-
|
44
|
-
c.execute statement
|
45
|
-
ActiveRecord::Base.connection_pool.checkin c
|
43
|
+
ActiveRecord::Base.connection.execute statement
|
46
44
|
else
|
47
45
|
tmp_path = UnixUtils.curl url
|
48
46
|
send config[:adapter], tmp_path
|
data/lib/data_miner/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: data_miner
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.5.
|
4
|
+
version: 2.5.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date: 2013-
|
16
|
+
date: 2013-07-05 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: aasm
|