csv2psql 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764ba1f133551d811fce81b53bda7b9fa53c3f31
-  data.tar.gz: d5501dd56420a37048ec43c08a61bd6070bc054d
+  metadata.gz: 22ed4a3c0fd8d982937fd5ff0fd94a28096b53ee
+  data.tar.gz: 69be2825f4e5073e8b1176e781c5c6be185c430d
 SHA512:
-  metadata.gz: 33e26a12dbce605939c42199023a321da5e871ddd7664b6ad221dffacb5ad3cf7b557e12d40ae01647fc551f7a7bff89cdaa53fca29e66abb6f8a6877e4443b8
-  data.tar.gz: 78b0315b8a67a9add8eb58fd4ac62df82f731f37a796fe90cdbf968af1bf22ed3f46a5f41db02542dd0cca1a72e35f1f72e2f4b389704bf90c45404484f002a1
+  metadata.gz: e83da80ea836915620c2da1093dbaf7246ad64456eb390d2a89085cef5a5a851b2f54c62b3893054c5af480e72d1d9a50ea4df643751a9681698884b99afb25a
+  data.tar.gz: 940af7ddd4b901109e9435b780441fbaed0327f59c5c871b841deb177cb59519b871fb436081b6aed94e6b917d5db86ec89d61bf39f5b18337deae1212b215a5

data/README.md

@@ -33,7 +33,7 @@ See **[examples](https://gist.github.com/korczis/2f7f54c7bd53554f44df)**
 ## Getting started 
 
 ```
-gem install csv2psql
+$ gem install csv2psql
 ```
 
 ## Usage
@@ -41,20 +41,22 @@ gem install csv2psql
 **Simple conversion**
 
 ```
-csv2psql convert data/sample.csv
+$ csv2psql convert data/sample.csv
 ```
 
 **Global help**
 
 ```
-csv2psql help
-
+$ csv2psql
 NAME
-    csv2psql - csv2psql 0.0.12 (Codename: Prudent owl)
+    csv2psql - Tool for converting CSV files to PSQL statements
 
 SYNOPSIS
     csv2psql [global options] command [command options] [arguments...]
 
+VERSION
+    0.0.15
+
 GLOBAL OPTIONS
     -d, --delimiter=arg - Column delimiter (default: ,)
     -h, --[no-]header   - Header row included (default: enabled)
@@ -63,20 +65,20 @@ GLOBAL OPTIONS
     -q, --quote=arg     - Quoting character (default: ")
     -s, --separator=arg - Line separator (default: none)
     --skip=arg          - How many rows skip (default: -1)
+    --version           - Display the program version
 
 COMMANDS
     analyze - Analyze csv file
     convert - Convert csv file
     help    - Shows a list of commands or help for one command
     schema  - Generate schema for file
-    version - Print version info```
+    version - Print version info
 ```
 
 **Analyze help**
 
 ```
-csv2psql help analyze
-
+$ csv2psql help analyze
 NAME
     analyze - Analyze csv file
 
@@ -84,14 +86,13 @@ SYNOPSIS
     csv2psql [global options] analyze [command options]
 
 COMMAND OPTIONS
-    -f, --format=arg - Output format (default: json)
+    -f, --format=arg - Output format json, table (default: json)
 ```
 
 **Convert help**
 
 ```
-csv2psql help convert
-
+$ csv2psql help convert
 NAME
     convert - Convert csv file
 
@@ -102,15 +103,14 @@ COMMAND OPTIONS
     --[no-]create-table   - Crate SQL Table before inserts
     --[no-]drop-table     - Drop SQL Table before inserts
     -t, --table=arg       - Table to insert to (default: none)
-    --[no-]transaction    - Import in transaction block (default: enabled)
+    --[no-]transaction    - Import in transaction block
     --[no-]truncate-table - Truncate SQL Table before inserts
 ```
 
 **Schema help**
 
 ```
-csv2psql help schema
-
+$ csv2psql help schema
 NAME
     schema - Generate schema for file
 
@@ -118,7 +118,7 @@ SYNOPSIS
     csv2psql [global options] schema [command options]
 
 COMMAND OPTIONS
-    -f, --format=arg - Output format (default: json)
+    -f, --format=arg - Output format - json, sql, table (default: json)
 ```
 
 ## Example
@@ -126,7 +126,7 @@ COMMAND OPTIONS
 **Input CSV**
 
 ```
-cat data/sample.csv
+$ cat data/sample.csv
 
 id,Firstname,Lastname,Address.Street,Address.City,Address.Details.Note
 12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available
@@ -136,7 +136,7 @@ id,Firstname,Lastname,Address.Street,Address.City,Address.Details.Note
 **Convert CSV**
 
 ```
-csv2psql convert data/sample.csv
+$ csv2psql convert data/sample.csv
 
 BEGIN;
 -- Table: my_table
@@ -149,7 +149,7 @@ COMMIT;
 **Convert CSV - Create table**
 
 ```
-csv2psql convert --create-table -t pokus data/sample.csv
+$ csv2psql convert --create-table -t pokus data/sample.csv
 
 BEGIN;
 -- Table: pokus
@@ -174,7 +174,7 @@ COMMIT;
 **Convert CSV - Stream directly to Postgres client (psql)**
 
 ```
-csv2psql convert --create-table -t hokus data/sample.csv | psql
+$ csv2psql convert --create-table -t hokus data/sample.csv | psql
 
 BEGIN
 CREATE TABLE
@@ -183,10 +183,17 @@ INSERT 0 1
 COMMIT
 ```
 
+```
+$ csv2psql convert --create-table -t hokus data/sample.csv | psql -h 127.0.0.1 -U jetel
+Password for user jetel:
+CREATE TABLE
+INSERT 0 1
+INSERT 0 1
+```
 **Convert CSV - Full load**
 
 ```
-csv2psql convert --create-table --drop-table --truncate-table -t test data/sample.csv
+$ csv2psql convert --create-table --drop-table --truncate-table -t test data/sample.csv
 
 BEGIN;
 DROP TABLE IF EXISTS test;
@@ -213,13 +220,13 @@ COMMIT;
 **Convert CSV - Load CIA Factbook automagically**
 
 ```
-csv2psql convert --create-table --drop-table --truncate-table --no-transaction -t test data/cia-data-all.csv | psql
+$ csv2psql convert --create-table --drop-table --truncate-table --no-transaction -t test data/cia-data-all.csv | psql
 ```
 
 **Analyze CSV - Show as table**
 
 ```
-csv2psql analyze --format=table tmp/sfpd_incident_2013.csv
+$ csv2psql analyze --format=table tmp/sfpd_incident_2013.csv
 
 +------------+--------+-----------+---------+------+--------+------+
 |                    tmp/sfpd_incident_2013.csv                    |
@@ -243,7 +250,7 @@ csv2psql analyze --format=table tmp/sfpd_incident_2013.csv
 **Schema guess**
 
 ```
-csv2psql schema -f table ./data/census_SFOH_2010.csv
+$ csv2psql schema -f table ./data/census_SFOH_2010.csv
 
 +-------------------------------------------------+---------+---------+
 |                     ./data/census_SFOH_2010.csv                     |

data/bin/csv2psql

@@ -1,4 +1,3 @@
 #! /usr/bin/env ruby
 
 require_relative '../lib/csv2psql/cli/cli'
-

data/lib/csv2psql/analyzer/types/bigint.rb

@@ -10,9 +10,11 @@ module Csv2Psql
       CLASS = :numeric
       WEIGHT = 4
 
+      RE = Regexp.new(/^\d+$/)
+
       class << self
         def analyze(val)
-          val.is_a?(Integer) || (val && !val.match(/^\d+$/).nil?)
+          val.is_a?(Integer) || (val && RE.match(val))
         end
 
         def convert(val)

data/lib/csv2psql/analyzer/types/boolean.rb

@@ -10,20 +10,34 @@ module Csv2Psql
       CLASS = :special
       WEIGHT = 5
 
-      BOOLEAN_VALUES = %w(true false 0 1)
-      BOOLEAN_VALUES_MAP = {}
-      BOOLEAN_VALUES.each do |k|
-        BOOLEAN_VALUES_MAP[k] = true
-      end
+      TRUE_VALUES = [
+        true,
+        't',
+        'true',
+        'y',
+        'yes',
+        'on',
+        '1',
+      ]
+      FALSE_VALUES = [
+        false,
+        'f',
+        'false',
+        'n',
+        'no',
+        'off',
+        '0'
+      ]
+      BOOLEAN_VALUES = TRUE_VALUES + FALSE_VALUES
 
       class << self
         def analyze(val)
-          return if val.nil? || val.empty?
-          BOOLEAN_VALUES_MAP.key?(val.downcase)
+          return false if val.nil? || val.empty?
+          BOOLEAN_VALUES.index(val) != nil
         end
 
         def convert(val)
-          val.to_i
+          val.downcase
         end
       end
     end

data/lib/csv2psql/analyzer/types/character.rb

@@ -6,7 +6,7 @@ module Csv2Psql
   module Analyzers
     # Character value matcher
     class Character < BaseAnalyzer
-      TYPE = :bigint
+      TYPE = :character
       CLASS = :character
       WEIGHT = 2
 

data/lib/csv2psql/analyzer/types/date.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+require_relative 'base_analyzer'
+
+module Csv2Psql
+  module Analyzers
+    # Bigint value matcher
+    class Date < BaseAnalyzer
+      TYPE = :date
+      CLASS = :date
+      WEIGHT = 3
+
+      RE = Regexp.new(/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/)
+
+      class << self
+        def analyze(val)
+          val && RE.match(val)
+        end
+
+        def convert(val)
+          val.to_i
+        end
+      end
+    end
+  end
+end

data/lib/csv2psql/analyzer/types/decimal.rb

@@ -9,12 +9,12 @@ module Csv2Psql
       TYPE = :decimal
       CLASS = :numeric
       WEIGHT = 3
-      RE = /^[-+]?[0-9]*[.,]?[0-9]+([eE][-+]?[0-9]+)?$/
+      RE = Regexp.new(/^[-+]?[0-9]*[.,]?[0-9]+([eE][-+]?[0-9]+)?$/)
 
       class << self
         def analyze(val)
           return true if val.is_a?(Float)
-          res = val && val.match(RE)
+          res = val && RE.match(val)
           !res.nil?
         end
 

data/lib/csv2psql/analyzer/types/string.rb

@@ -12,7 +12,7 @@ module Csv2Psql
 
       class << self
         def analyze(val)
-          val.is_a?(::String)
+          val.is_a?(::String) && !val.empty?
         end
       end
     end

data/lib/csv2psql/analyzer/types/time.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+require_relative 'base_analyzer'
+
+module Csv2Psql
+  module Analyzers
+    # Bigint value matcher
+    class Time < BaseAnalyzer
+      TYPE = :time
+      CLASS = :date
+      WEIGHT = 3
+
+      RE = Regexp.new(/^[0-9]{2}:[0-9]{2}(:[0-9]{2})?$/)
+
+      class << self
+        def analyze(val)
+          val && RE.match(val)
+        end
+
+        def convert(val)
+          val.to_i
+        end
+      end
+    end
+  end
+end

data/lib/csv2psql/analyzer/types/uuid.rb

@@ -10,14 +10,11 @@ module Csv2Psql
       CLASS = :special
       WEIGHT = 5
 
-      RE = /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/ # rubocop:disable Metrics/LineLength
+      RE = Regexp.new(/^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/) # rubocop:disable Metrics/LineLength
 
       class << self
         def analyze(val)
-          return false
-
-          match = val && val.match(RE)
-          !match.nil?
+          val && val.match(RE)
         end
       end
     end

data/lib/csv2psql/cli/cmd/schema_cmd.rb

@@ -8,7 +8,7 @@ require_relative '../../convert/convert'
 require_relative '../../helpers/erb_helper'
 require_relative '../../processor/processor'
 
-BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+BASE_DIR = File.join(File.dirname(__FILE__), '..', '..')
 TEMPLATE_DIR = File.join(BASE_DIR, 'templates')
 SCHEMA_TEMPLATE = File.join(TEMPLATE_DIR, 'schema.sql.erb')
 

data/lib/csv2psql/generator/generator.rb

@@ -10,7 +10,7 @@ require_relative '../helpers/erb_helper'
 module Csv2Psql
   # SQL Code generator
   class Generator
-    BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..')
+    BASE_DIR = File.join(File.dirname(__FILE__), '..')
     TEMPLATE_DIR = File.join(BASE_DIR, 'templates')
     CREATE_TABLE_TEMPLATE = File.join(TEMPLATE_DIR, 'create_table.sql.erb')
     DROP_TABLE_TEMPLATE = File.join(TEMPLATE_DIR, 'drop_table.sql.erb')

data/lib/csv2psql/processor/processor.rb

@@ -70,7 +70,11 @@ module Csv2Psql
           analyzer.analyze(path, data[:row], opts)
         end
 
-        res[path] = SchemaGenerator.generate(analyzer.files[path])
+        analysis = analyzer.files[path]
+        if analysis
+          res[path] = SchemaGenerator.generate(analysis)
+        end
+
       end
       res
     end

data/lib/csv2psql/schema/schema_generator.rb

@@ -7,6 +7,7 @@ module Csv2Psql
       def select_analyzers_by_match(analyzers, match)
         null_count = analyzers['Null'][:results][:count]
         analyzers.select do |_k, v|
+          next if _k != 'String' && v[:results][:count] == 0
           v[:results][:count] + null_count == match
         end
       end
@@ -15,8 +16,13 @@ module Csv2Psql
         analyzers.select { |_k, v| v[:class].sql_class?(class_name) }
       end
 
-      def select_best(analyzers, lines)
-        analyzers = select_analyzers_by_match(analyzers, lines)
+      def select_best(in_analyzers, lines)
+        analyzers = select_analyzers_by_match(in_analyzers, lines)
+
+        # matched_analyzers = analyzers.select do |name, analyzer|
+        #   analyzer[:results][:count] === lines
+        # end
+
         sorted = analyzers.sort do |a, b|
           a[1][:class].weight <=> b[1][:class].weight
         end

data/lib/csv2psql/version.rb

@@ -2,5 +2,5 @@
 
 # Csv2Psql module
 module Csv2Psql
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Tomas Korcak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -289,9 +289,11 @@ files:
 - lib/csv2psql/analyzer/types/bigint.rb
 - lib/csv2psql/analyzer/types/boolean.rb
 - lib/csv2psql/analyzer/types/character.rb
+- lib/csv2psql/analyzer/types/date.rb
 - lib/csv2psql/analyzer/types/decimal.rb
 - lib/csv2psql/analyzer/types/null.rb
 - lib/csv2psql/analyzer/types/string.rb
+- lib/csv2psql/analyzer/types/time.rb
 - lib/csv2psql/analyzer/types/uuid.rb
 - lib/csv2psql/cache/cache.rb
 - lib/csv2psql/cli/app.rb
@@ -317,6 +319,11 @@ files:
 - lib/csv2psql/output/output.rb
 - lib/csv2psql/processor/processor.rb
 - lib/csv2psql/schema/schema_generator.rb
+- lib/csv2psql/templates/create_table.sql.erb
+- lib/csv2psql/templates/drop_table.sql.erb
+- lib/csv2psql/templates/header.sql.erb
+- lib/csv2psql/templates/schema.sql.erb
+- lib/csv2psql/templates/truncate_table.sql.erb
 - lib/csv2psql/version.rb
 - spec/cli/app_spec.rb
 - spec/cli/cmd/analyze_cmd_spec.rb
@@ -324,11 +331,6 @@ files:
 - spec/cli/cmd/version_cmd_spec.rb
 - spec/helpers/cli_helper.rb
 - spec/spec_helper.rb
-- templates/create_table.sql.erb
-- templates/drop_table.sql.erb
-- templates/header.sql.erb
-- templates/schema.sql.erb
-- templates/truncate_table.sql.erb
 homepage: https://github.com/korczis/csv2psql
 licenses:
 - MIT