GFunk911-dataload 0.8.2 → 0.8.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 8

data/lib/dataload/batch_insert.rb

@@ -1,4 +1,4 @@
-class BatchInsert
+class StandardBatchInsert
   include FromHash
   attr_accessor :rows, :table_name
   fattr(:column_names) { rows.first.sorted_column_names }
@@ -15,4 +15,23 @@ class BatchInsert
     ActiveRecord::Base.connection.execute(insert_sql) 
   end
 end
-    
+    
+class OracleBatchInsert < StandardBatchInsert
+  fattr(:insert_sql) do
+    str = ["INSERT ALL "]
+    rows.each do |row|
+      str << "INTO #{table_name} #{columns_sql} VALUES #{row.insert_values_sql}"
+    end
+    str.join("\n") + "\nSELECT * from dual;"
+  end
+end
+
+class BatchInsert
+  def self.get_class
+    if %w(oci oci8 oracle).include?(MasterLoader.instance.db_ops[:adapter])
+      OracleBatchInsert
+    else
+      StandardBatchInsert
+    end
+  end
+end

data/lib/dataload/master_loader.rb

@@ -3,10 +3,10 @@ class MasterLoader
   attr_accessor_nn :raw_table_load_order, :db_ops, :block_size
   fattr(:raw_table_delete_order) { raw_table_load_order.reverse }
   fattr(:tables_in_load_order) do
-    raw_table_load_order.map { |x| table_hash[x.to_s] }
+    raw_table_load_order.map { |x| table_hash[x.to_s]||raise("can't find table #{x}") }
   end
   fattr(:tables_in_delete_order) do
-    raw_table_delete_order.map { |x| table_hash[x.to_s] }
+    raw_table_delete_order.map { |x| table_hash[x.to_s]||raise("can't find table #{x}") }
   end
   fattr(:table_hash) { {} }
   def add(tl)

data/lib/dataload/table_loader.rb

@@ -38,12 +38,18 @@ class TableLoader
       yield(target_hashes(rows),i*block_size+rows.size)
     end
   end
+  def next_pk
+    @next_pk ||= 1
+    @next_pk += 1
+    @next_pk
+  end
   def load!
     migrate!
     Dataload.log "Starting load of table '#{table_name}'"
     total = 0
     target_hash_groups do |hs,num_inserted|
-      BatchInsert.new(:rows => hs, :table_name => table_name).insert!
+      hs.each { |h| h[:id] = next_pk }
+      BatchInsert.get_class.new(:rows => hs, :table_name => table_name).insert!
       Dataload.log "Inserted #{block_size} rows into table '#{table_name}'.  Total of #{num_inserted} rows inserted."
       total = num_inserted
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: GFunk911-dataload
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Mike Harris