load_data_infile2 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0f292c77592b2d745b4db05fbbbd8245b17044
-  data.tar.gz: 56e2f3d2bbc9ef359af4025dbd0a07b195e927a6
+  metadata.gz: 87b9140ace11ad2189f8f576e5643f554989f043
+  data.tar.gz: 5b589c0d32973317a5545a0857a927e9f0a7f7fa
 SHA512:
-  metadata.gz: dd75af4d2246b6d6b116808970e4bad0cfaa374c4a2a5f2d31b50ff312f26e3c8a97714295b2202c65c0e1ffa4068779a9e57f116d814a34e29c9f56c4a107f6
-  data.tar.gz: d32e50d8e90dc0a744ba995c2d5933ff7090d9eb2a8d186e42bc100e06e313e3b656064c38c8c29c7248023a918558d9ebca0e12b889f5af76501767d9cdd8c1
+  metadata.gz: 5ba411422e6300479ce7aa9d7928a524c596181725c42f17c3d6e1633061521df7226336ca7091dad7e16df160f9b7f27b91b6bde3bca3195e0ea378172ebf50
+  data.tar.gz: 56bc6ed3204230c9e3b975cf294854570e0e98ea8e62e86f4cc1b307d8b96e2e0b4c8db63899ae8c2fab626f754fbbdb62be7257d620748960b6e3aa4b7c717f

data/lib/load_data_infile2/active_record.rb

@@ -5,11 +5,11 @@ module LoadDataInfile2
     def initialize(ar_subclass, options = {})
       @ar_class = ar_subclass
       if options[:local_infile]
-        raise "Require option as `local_infile: true` in config/database.yml" unless ar_class.connection.instance_variable_get(:@connection).query_options[:local_infile]
+        raise "Require option as `local_infile: true` in config/database.yml" unless @ar_class.connection.instance_variable_get(:@connection).query_options[:local_infile]
       end
 
       @load_data_infile_options = LoadDataInfile2.default_import_options.merge(options)
-      @load_data_infile_options[:charset] = ar_class.connection_config[:charset] unless options.has_key?(:charset)
+      @load_data_infile_options[:charset] = @ar_class.connection_config[:charset] unless options.has_key?(:charset)
     end
 
     def import(file, options = {})
@@ -18,14 +18,12 @@ module LoadDataInfile2
 
     private
 
-    attr_reader :ar_class, :load_data_infile_options
-
     def build_sql(file, options = {})
-      LoadDataInfile2::Sql.new(file, ar_class.quoted_table_name, load_data_infile_options.merge(options)).build
+      LoadDataInfile2::Sql.new(file, @ar_class.quoted_table_name, @load_data_infile_options.merge(options)).build
     end
 
     def query(sql)
-      ar_class.connection.execute(sql)
+      @ar_class.connection.execute(sql)
     end
   end
 end

data/lib/load_data_infile2/sql.rb

@@ -47,26 +47,26 @@ module LoadDataInfile2
 
     def load_data_infile
       stmt = 'LOAD DATA '
-      stmt.concat("#{options[:low_priority_or_concurrent].upcase} ") if %i(low_priority concurrent).include?(options[:low_priority_or_concurrent])
-      stmt.concat('LOCAL ') if options[:local_infile]
-      stmt.concat("INFILE '#{file}'")
+      stmt.concat("#{@options[:low_priority_or_concurrent].upcase} ") if %i(low_priority concurrent).include?(@options[:low_priority_or_concurrent])
+      stmt.concat('LOCAL ') if @options[:local_infile]
+      stmt.concat("INFILE '#{@file}'")
       stmt
     end
 
     def replace_or_ignore
-      options[:replace_or_ignore].to_s.upcase if %i(replace ignore).include?(options[:replace_or_ignore])
+      @options[:replace_or_ignore].to_s.upcase if %i(replace ignore).include?(@options[:replace_or_ignore])
     end
 
     def into_table
-      "INTO TABLE #{table}"
+      "INTO TABLE #{@table}"
     end
 
     def partition
-      "PARTITION (#{Array(options[:partition]).join(', ')})" if options[:partition] && options[:partition].size > 0
+      "PARTITION (#{Array(@options[:partition]).join(', ')})" if @options[:partition] && @options[:partition].size > 0
     end
 
     def character_set
-      "CHARACTER SET #{options[:charset]}" if options[:charset]
+      "CHARACTER SET #{@options[:charset]}" if @options[:charset]
     end
 
     def fields
@@ -83,19 +83,19 @@ module LoadDataInfile2
     end
 
     def fields_terminated_by
-      "TERMINATED BY '#{options[:fields_terminated_by]}'" if options[:fields_terminated_by]
+      "TERMINATED BY '#{@options[:fields_terminated_by]}'" if @options[:fields_terminated_by]
     end
 
     def fields_enclosed_by
-      "ENCLOSED BY '#{options[:fields_enclosed_by]}'" if options[:fields_enclosed_by]
+      "ENCLOSED BY '#{@options[:fields_enclosed_by]}'" if @options[:fields_enclosed_by]
     end
 
     def fields_optionally_enclosed_by
-      "OPTIONALLY ENCLOSED BY '#{options[:fields_optionally_enclosed_by]}'" if options[:fields_optionally_enclosed_by]
+      "OPTIONALLY ENCLOSED BY '#{@options[:fields_optionally_enclosed_by]}'" if @options[:fields_optionally_enclosed_by]
     end
 
     def fields_escaped_by
-      "ESCAPED BY '#{options[:fields_escaped_by]}'" if options[:fields_escaped_by]
+      "ESCAPED BY '#{@options[:fields_escaped_by]}'" if @options[:fields_escaped_by]
     end
 
     def lines
@@ -110,24 +110,24 @@ module LoadDataInfile2
     end
 
     def lines_starting_by
-      "STARTING BY '#{options[:lines_starting_by]}'" if options[:lines_starting_by]
+      "STARTING BY '#{@options[:lines_starting_by]}'" if @options[:lines_starting_by]
     end
 
     def lines_terminated_by
-      "TERMINATED BY '#{options[:lines_terminated_by]}'" if options[:lines_terminated_by]
+      "TERMINATED BY '#{@options[:lines_terminated_by]}'" if @options[:lines_terminated_by]
     end
 
     def ignore_lines
-      "IGNORE #{options[:ignore_lines].to_i} LINES" if options[:ignore_lines].to_i > 0
+      "IGNORE #{@options[:ignore_lines].to_i} LINES" if @options[:ignore_lines].to_i > 0
     end
 
     def columns
-      "(#{options[:columns].join(', ')})" if options[:columns] && options[:columns].size > 0
+      "(#{@options[:columns].join(', ')})" if @options[:columns] && @options[:columns].size > 0
     end
 
     def set
-      if options[:set] && options[:set].size > 0
-        s = options[:set].map {|col, val| "#{col} = #{val}" }.join(', ')
+      if @options[:set] && @options[:set].size > 0
+        s = @options[:set].map {|col, val| "#{col} = #{val}" }.join(', ')
         "SET #{s}"
       end
     end

data/lib/load_data_infile2/version.rb

@@ -1,3 +1,3 @@
 module LoadDataInfile2
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: load_data_infile2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - nalabjp