csv2psql 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9744ca214c289da5109fb90290641c58da8c798d
-  data.tar.gz: 7a3579322104b35e9db4e1a3709e45fd5534d1f2
+  metadata.gz: e9f2aaa26746a4f627968755685e09b4de8eca7f
+  data.tar.gz: 511b57240f7c0588d6c3d366e5f807229b0a6664
 SHA512:
-  metadata.gz: 4090eaeb4baf5498665affa16d3eecc276558a63a94519934eb5ecd8937588a44de958a00defcabd4cc3a2b6dca6d88a29a08a35d514edb28bdb46431e5478a6
-  data.tar.gz: 6ca73b4f105aeded11e69785842ae84d18b74060eec70be86d87c8d05ed2a4426a7fb70d3b97c2c17ef01b48d0cb38a546d32b12e9238578e3c83e15e8a662ef
+  metadata.gz: 169542faf9dadeef826a4205cb2cc7f59d836cbd71b5bb9930d58e7e14d641c8bb2b5b77dd540854e2dbcf67bc4a9f9945e21df1c92fbdb937e81116d7e7762d
+  data.tar.gz: eb29f050adcceace67b611cd6c65649b4e775a1e6a0ae921734922aad5fd752dbc79c31489709c8606fc32afa7d9ae1780e251ebe7a11ebeb75c8fe84d90e52c

data/README.md

@@ -56,6 +56,7 @@ SYNOPSIS
     csv2psql [global options] convert [command options]
 
 COMMAND OPTIONS
+    --[no-]create-table - Crate SQL Table before inserts
     -d, --delimiter=arg - Column delimiter (default: ,)
     -h, --[no-]header   - Header row included (default: enabled)
     -q, --quote=arg     - Quoting character (default: ")
@@ -87,6 +88,32 @@ INSERT INTO my_table(id, firstname, lastname, address_street, address_city, addr
 COMMIT;
 ```
 
+**Convert CSV - Create table**
+
+```
+csv2psql convert --create-table -t pokus data/sample.csv
+
+BEGIN;
+-- Table: pokus
+-- DROP TABLE pokus;
+
+CREATE TABLE pokus(
+	id TEXT,
+	firstname TEXT,
+	lastname TEXT,
+	address_street TEXT,
+	address_city TEXT,
+	address_details_note TEXT
+)
+WITH (
+  OIDS=FALSE
+);
+
+INSERT INTO pokus(id, firstname, lastname, address_street, address_city, address_details_note) VALUES('12345', 'Joe', 'Doe', '#2140 Taylor Street, 94133', 'San Francisco', 'Pool available');
+INSERT INTO pokus(id, firstname, lastname, address_street, address_city, address_details_note) VALUES('45678', 'Jack', 'Plumber', '#111 Sutter St, 94104', 'San Francisco', 'Korean Deli near to main entrance');
+COMMIT;
+```
+
 ## Contributing to csv2psql
 
 - Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

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

@@ -6,36 +6,46 @@ include GLI::App
 
 require_relative '../shared'
 require_relative '../../convert/convert'
+require_relative '../../processor/processor'
 
 cmds = {
   h: {
     desc: 'Header row included',
-    default_value: true
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:header]
   },
 
   d: {
     desc: 'Column delimiter',
-    type: String, default_value: ','
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:delimiter]
   },
 
   t: {
     desc: 'Table to insert to',
-    type: String, default_value: 'my_table'
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:table]
   },
 
   q: {
     desc: 'Quoting character',
-    type: String, default_value: '"'
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:quote]
   },
 
   s: {
     desc: 'Line separator',
-    type: String, default_value: :auto
+    type: String,
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:separator]
   },
 
   transaction: {
     desc: 'Import in transaction block',
-    type: String, default_value: true
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:transaction]
+  },
+
+  'create-table' => {
+    desc: 'Crate SQL Table before inserts',
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['create-table']
   }
 }
 
@@ -47,6 +57,7 @@ command :convert do |c|
   c.flag [:q, :quote], cmds[:q]
   c.flag [:s, :separator], cmds[:s]
   c.switch [:transaction], cmds[:transaction]
+  c.switch ['create-table'], cmds['create-table']
 
   c.action do |global_options, options, args|
     fail ArgumentError, 'No file to convert specified' if args.empty?

data/lib/csv2psql/helpers/erb_helper.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+require 'erb'
+require 'pathname'
+
+module Csv2Psql
+  # ERB Helper
+  class ErbHelper
+    BASE_DIR = File.join(File.dirname(__FILE__), '..')
+
+    def render(filename)
+      path = File.join(BASE_DIR, filename)
+      File.read(path)
+    end
+
+    def process(filename, ctx = {})
+      ctx ||= {} # rubocop:disable Lint/UselessAssignment
+      b = binding
+      erb = ERB.new(File.read(filename), 0, '>')
+      erb.filename = filename
+      erb.result b
+    end
+
+    def run
+      FILES.each do |files|
+        process(files)
+      end
+    end
+  end
+end

data/lib/csv2psql/processor/processor.rb

@@ -6,6 +6,7 @@ require 'pathname'
 require 'pp'
 
 require_relative '../version'
+require_relative '../helpers/erb_helper'
 
 module Csv2Psql
   # Csv2Psql processor class
@@ -13,18 +14,38 @@ module Csv2Psql
     attr_reader :path
 
     DEFAULT_OPTIONS = {
+      'create-table' => false,
       delimiter: ',',
       header: true,
       separator: :auto,
+      table: 'my_table',
+      transaction: true,
       quote: '"'
     }
 
+    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')
+
     def convert(paths, opts = {})
       with_paths(paths, opts) do |data|
         puts format_row(data[:row], opts)
       end
     end
 
+    def create_table(path, row, opts = {})
+      header = get_header(row, opts)
+      columns = get_columns(row, opts, header)
+      erb = ErbHelper.new
+      ctx = {
+        path: path,
+        header: header,
+        columns: columns,
+        table: opts[:table] || DEFAULT_OPTIONS[:table]
+      }
+      erb.process(CREATE_TABLE_TEMPLATE, ctx)
+    end
+
     def format_row(row, opts = {})
       header = get_header(row, opts)
       columns = get_columns(row, opts, header).join(', ')
@@ -67,15 +88,16 @@ module Csv2Psql
     end
 
     def sanitize_header(header_column)
-      header_column.downcase.gsub(/\./, '_')
+      header_column.downcase.gsub(/[^0-9a-z ]/i, '_')
     end
 
     def with_path(path, opts = {}, &block)
       puts 'BEGIN;' if opts[:transaction]
       csv_opts = merge_csv_options(opts)
+      @first_row = true
       CSV.open(path, 'rt', csv_opts) do |csv|
         csv.each do |row|
-          with_row(path, row, &block)
+          with_row(path, row, opts, &block)
         end
       end
       puts 'COMMIT;' if opts[:transaction]
@@ -88,11 +110,14 @@ module Csv2Psql
       end
     end
 
-    def with_row(path, row, &block)
-      args = {
-        path: path,
-        row: row
-      }
+    def with_row(path, row, opts = {}, &block)
+      args = { path: path, row: row }
+      if @first_row
+        ct = DEFAULT_OPTIONS['create-table']
+        ct = opts['create-table'] unless opts['create-table'].nil?
+        puts create_table(path, row, opts) if ct
+        @first_row = false
+      end
       block.call(args) if block_given?
     end
   end

data/lib/csv2psql/version.rb

@@ -2,5 +2,5 @@
 
 # Csv2Psql module
 module Csv2Psql
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/templates/create_table.sql.erb

@@ -0,0 +1,15 @@
+-- Table: <%= ctx[:table] %>
+
+-- DROP TABLE <%= ctx[:table] %>;
+
+CREATE TABLE <%= ctx[:table] %>
+(
+<% ctx[:columns].each_with_index do |item, index| %>
+	<%= item %> TEXT<%= ", " if index < ctx[:columns].length - 1%>
+
+<% end %>
+)
+WITH (
+  OIDS=FALSE
+);
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomas Korcak
@@ -201,10 +201,12 @@ files:
 - lib/csv2psql/cli/cmd/version_cmd.rb
 - lib/csv2psql/cli/shared.rb
 - lib/csv2psql/convert/convert.rb
+- lib/csv2psql/helpers/erb_helper.rb
 - lib/csv2psql/lib.rb
 - lib/csv2psql/processor/processor.rb
 - lib/csv2psql/version.rb
 - spec/spec_helper.rb
+- templates/create_table.sql.erb
 homepage: https://github.com/korczis/csv2psql
 licenses:
 - MIT