place the id return into every model and mark the model as clean? (si…

…nce it has been saved)

lib/activerecord-import/active_record/adapters/postgresql_adapter.rb

@@ -3,5 +3,11 @@
 
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   include ActiveRecord::Import::PostgreSQLAdapter
+
+  alias_method :post_sql_statements_orig, :post_sql_statements
+  def post_sql_statements( table_name, options ) # :nodoc:
+    post_sql_statements_orig(table_name, options).append(" RETURNING ID")
+  end
+
 end
 

lib/activerecord-import/adapters/abstract_adapter.rb

@@ -60,13 +60,13 @@ def insert_many( sql, values, *args ) # :nodoc:
       if NO_MAX_PACKET == max or total_bytes < max
         number_of_inserts += 1
         sql2insert = base_sql + values.join( ',' ) + post_sql
-        ids = insert( sql2insert, *args )
+        ids = select_values( sql2insert)
       else
         value_sets = self.class.get_insert_value_sets( values, sql_size, max )
         value_sets.each do |values|
           number_of_inserts += 1
           sql2insert = base_sql + values.join( ',' ) + post_sql
-          ids.concat(select_many( sql2insert))
+          ids.concat(select_values( sql2insert))
         end
       end
 

lib/activerecord-import/import.rb

@@ -226,7 +226,11 @@ def import( *args )
         sync_keys = options[:synchronize_keys] || [self.primary_key]
         synchronize( options[:synchronize], sync_keys)
       end
-
+      # if we have ids, then set the id on the models and mark the models as clean.
+      return_obj.ids.each_with_index do |obj, index|
+        models[index].id = obj.to_i
+        models[index].instance_variable_get(:@changed_attributes).clear # mark the model as saved
+      end
       return_obj.num_inserts = 0 if return_obj.num_inserts.nil?
       return_obj
     end