csv2sql 0.2.070313 → 0.2.070529155119

data/lib/csv2sql.rb

@@ -27,9 +27,15 @@ require 'pathname'
 #   puts Csv2sql.new("account_balances.csv").to_updates([nil, 'balance'], :table => 'accounts')
 #
 class Csv2sql
-
+  
+  @@defaults = {
+    :before => "",   # can be changed to "start transaction;\n"
+    :after  => ";\n" # can be changes to "commit;\n"
+  }
+  
   def self.default_value_filter(v, i, j, k)
-    return 'null' if v.nil? or v.strip! == ''
+    return 'null' if v.to_s == ''
+    return v.to_s if v.is_a? Float or v.is_a? Fixnum
     v.gsub!(/"/, '\\"')
     "\"#{v}\""
   end
@@ -40,27 +46,32 @@ class Csv2sql
 
   # Sql inserts
   #
+  # Please note that you can set table name with values :table => 'my_table(id, col1, col2...)'
+  # to make inserts into specific columns only.
+  #
   # Optional named args:
+  #   :ignore - true/false, if true uses INSERT IGNORE ...
   #   :bulk   - if true, bulk insert (see cluster size in your sql server to make big bulks to avoid server gone away!)
   #   :table  - default based on filename
-  #   :before - default to start transaction
-  #   :after  - default to commit
+  #   :before - default to blank 
+  #   :after  - default to ;
   #   ...see Csv2sql#to_any for the rest
   #
   def to_inserts(args={})
     args[:table] ||= Pathname.new(@filename).basename.to_s.downcase.gsub(/\W/, '_')
+    args[:before] ||= @@defaults[:before]
+    args[:after]  ||= @@defaults[:after]
+    insert_sql = args[:ignore] ? 'insert ignore' : 'insert'
     if args[:bulk]
-      args[:before]      ||= "start transaction;\ninsert into #{args[:table]} values"
+      args[:before]       += "#{insert_sql} into #{args[:table]} values"
       args[:values_glue] ||= ", "
       args[:row_format]  ||= " (%s)"
       args[:row_glue]    ||= ",\n"
-      args[:after]       ||= ";\ncommit;\n"
     else
-      args[:before]      ||= "start transaction;\n"
+      args[:before]      ||= ""
       args[:values_glue] ||= ", "
-      args[:row_format]  ||= "insert into #{args[:table]} values(%s)"
+      args[:row_format]  ||= "#{insert_sql} into #{args[:table]} values(%s)"
       args[:row_glue]    ||= ";\n"
-      args[:after]       ||= ";\ncommit;\n"
     end
     to_any args
   end
@@ -75,7 +86,8 @@ class Csv2sql
   def to_updates(set_columns, args={})
     args[:pk]          ||= [0, 'id']
     args[:table]       ||= Pathname.new(@filename).basename.to_s.downcase.gsub(/\W/, '_')
-    args[:before]      ||= "start transaction;\n"
+    args[:before]      ||= @@defaults[:before]
+    args[:after]       ||= @@defaults[:after]
     args[:values_glue] ||= ", "
     args[:row_format]  ||= lambda do |values|
       r = []
@@ -83,7 +95,6 @@ class Csv2sql
       "update #{args[:table]} set #{r.join(', ')} where #{args[:pk][1]} = #{values[args[:pk][0]]}"
     end
     args[:row_glue]    ||= ";\n"
-    args[:after]       ||= ";\ncommit;\n"
     to_any args
   end
   
@@ -138,7 +149,7 @@ class Csv2sql
           
           if values
           
-            if args[:value_filter] # LOOK OUT! value_filter for single value
+            if args[:value_filter] # LOOK OUT! value_filter is for single value
               k = -1
               values = values.map do |value|
                 k += 1
@@ -155,17 +166,3 @@ class Csv2sql
   end
 
 end
-
-# Test
-if $0 == __FILE__
-  
-  csv2sql = Csv2sql.new("GMCLIENT.TXT")
-  #~ puts csv2sql.to_inserts(:bulk => true)
-  
-  #~ puts csv2sql.to_inserts()
-  #~ puts csv2sql.to_updates([nil, 'balance'], :table => 'accounts')
-  
-  PROPERSYS_ROOT = 'c:/Users/Mirek/Ringley/PROPERSYS2'
-  puts Csv2sql.new("#{PROPERSYS_ROOT}/GMTENANT.TXT").to_updates([nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 'balance'], :table => 'accounts')
-  
-end 

data/tests/files/gmclient.csv

@@ -0,0 +1,11 @@
+0321S,         0,         0,    335.48,       230,W    ,30/06/07
+0442S,   2234.72,   -234.12,   1325.34,       450,M    ,31/02/07
+0034S,   3421.44,   9254.98,   2357.39,      1520,E    ,31/01/07
+0248S,  12326.82,  26246.48,   5436.61,      1234,W    ,30/05/07
+,,,,,,
+0052S,  12349.32,  12435.67,    1249.2,       340,W    ,
+0342S,  -2243.84,  32134.37,   1123439,      2450,L    ,31/04/07
+
+0042S,   1249.32,     345.4,         0,      1234,J    ,31/05/07
+0024S, -12346.12,  23562.54,   2345.55,       450,W    ,31/06/07
+wrong,    number,        of,    values

data/tests/instant.rb

@@ -0,0 +1,13 @@
+
+require '../lib/csv2sql.rb'
+
+@files_dir = File.dirname(__FILE__) + '/files'
+@gmclient_file = "#{@files_dir}/gmclient.csv"
+
+puts Csv2sql.new(@gmclient_file).to_inserts(
+  :values_filter => lambda do |values, i, j|
+    return [values[0]]
+  end,
+  :table => "estates(id)",
+  :ignore => true
+)

data/tests/test.rb

@@ -0,0 +1,16 @@
+
+require 'test/unit'
+require '../lib/csv2sql'
+
+class Csv2sqlTest < Test::Unit::TestCase
+  
+  def setup
+    @files_dir = File.dirname(__FILE__) + '/files'
+    @gmclient_file = "#{@files_dir}/gmclient.csv"
+  end
+  
+  def test_to_inserts()
+    
+  end
+  
+end 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: csv2sql
 version: !ruby/object:Gem::Version 
-  version: 0.2.070313
-date: 2007-03-13 00:00:00 +00:00
+  version: 0.2.070529155119
+date: 2007-05-29 00:00:00 +01:00
 summary: Csv2sql provides an easy way to convert comma separated files to sql
 require_paths: 
 - lib
@@ -29,6 +29,10 @@ post_install_message:
 authors: 
 - Mirek Rusin
 files: 
+- tests/files
+- tests/instant.rb
+- tests/test.rb
+- tests/files/gmclient.csv
 - lib/csv2sql.rb
 - README
 test_files: []