activerecord-fast-import 0.1.4 → 0.2.0

data/.gitignore

@@ -3,4 +3,5 @@
 coverage
 rdoc
 pkg
-nbproject/private
+nbproject/private
+.idea

data/README.markdown

@@ -61,6 +61,15 @@ We want to concatenate those two columns into one.
 
 Of course you can use any of those shiny [MySQL functions](http://dev.mysql.com/doc/refman/5.1/en/functions.html).
 
+### Extra features - added by Rafal Piekarski
+
+This version also provides other "LOAD DATA" features and they are fields in options hash:
+
+    :insert_method  # defines method for inserting data: IGNORE or REPLACE
+    :charset_name   # defines file charset
+    :fields_optionally_enclosed_by # allows you to define fields enclosure method
+    :fields_escaped_by # changes the escape character                     
+
 ## Copyright
 
 Copyright (c) 2009 Jan Suchal. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/activerecord-fast-import.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-fast-import}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Suchal"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2010-02-17}
   s.description = %q{Native MySQL additions to ActiveRecord, like LOAD DATA INFILE, ENABLE/DISABLE KEYS, TRUNCATE TABLE.}
   s.email = %q{johno@jsmf.net}
   s.extra_rdoc_files = [
@@ -55,3 +55,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, [">= 2.1.2"])
   end
 end
+

data/lib/activerecord-fast-import.rb

@@ -1,5 +1,3 @@
-require 'activerecord'
-
 module ActiveRecord #:nodoc:
   class Base
     # Deletes all rows in table very fast, but without calling +destroy+ method
@@ -25,16 +23,23 @@ module ActiveRecord #:nodoc:
       enable_keys
     end
 
-    # Loads data from file using MySQL native LOAD DATA INFILE query, disabling
+    # Loads data from file(s) using MySQL native LOAD DATA INFILE query, disabling
     # key updates for even faster import speed
     #
     # ==== Parameters
-    # * +file+ file(s) to import
+    # * +files+ file(s) to import
     # * +options+ (see <tt>load_data_infile</tt>)
     def self.fast_import(files, options = {})
       files = [files] unless files.is_a? Array
       with_keys_disabled do
-        files.each {|file| load_data_infile(file, options)}
+        load_data_infile_multiple(files, options)
+      end
+    end
+
+    # Loads data from multiple files using MySQL native LOAD DATA INFILE query
+    def self.load_data_infile_multiple(files, options = {})
+      files.each do |file|
+        load_data_infile(file, options)
       end
     end
 
@@ -44,8 +49,17 @@ module ActiveRecord #:nodoc:
     # * +file+ the file to import
     # * +options+ 
     def self.load_data_infile(file, options = {})
-      sql = "LOAD DATA LOCAL INFILE '#{file}' INTO TABLE #{quoted_table_name} "
-      sql << "FIELDS TERMINATED BY '#{options[:fields_terminated_by]}' " if options[:fields_terminated_by]
+      sql = "LOAD DATA LOCAL INFILE '#{file}' "
+      sql << "#{options[:insert_method]} " if options[:insert_method]
+      sql << "INTO TABLE #{quoted_table_name} "
+      sql << "CHARACTER SET #{options[:charset_name]} " if options[:charset_name]
+      
+      fields = ""
+      fields << "TERMINATED BY '#{options[:fields_terminated_by]}' " if options[:fields_terminated_by]
+      fields << "OPTIONALLY ENCLOSED BY '#{options[:fields_optionally_enclosed_by]}' " if options[:fields_optionally_enclosed_by]
+      fields << "ESCAPED BY '#{options[:fields_escaped_by]}' " if options[:fields_escaped_by]
+
+      sql << "FIELDS #{fields} " unless fields.empty?      
       sql << "LINES TERMINATED BY '#{options[:lines_terminated_by]}' " if options[:lines_terminated_by]
       sql << "IGNORE #{options[:ignore_lines]} LINES " if options[:ignore_lines]
       sql << "(" + options[:columns].join(', ') + ") " if options[:columns]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-fast-import
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Suchal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +02:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency