sqldump 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+Version 0.0.4
+-------------
+
+- Added suppress nulls option for SQL output.
+
+
 Version 0.0.3
 -------------
 

data/NOTES

@@ -0,0 +1,3 @@
+To run the Cucumber features, you will need a local PostgreSQL installation 
+and a user "sqldump" with password "sqldump". The sqldump user must have
+the CREATE_DB attribute.

data/README.md

@@ -10,10 +10,12 @@ Just install the gem with
 $ gem install sqldump
 ```
 
-This will make the executable `sqldump` available from your command line. SQLite3 is a direct dependency and is installed if you don't already have it. Other drivers must be installed manually. E.g.
+This will make the executable `sqldump` available from your command line.
+
+Database access is through Ruby/DBI. DBD::SQLite3 is a direct dependency and is installed if you don't already have it. Other drivers must be installed manually. E.g.
 
 ```bash
-$ gem install pg
+$ gem install dbd-pg
 ```
 
 **Requires Ruby 1.9.2 or later.**
@@ -53,9 +55,7 @@ This gem is created by Mats Sigge and is under the MIT License.
 ## Roadmap
 
 ###Immediate goals
-* Selecting only some columns.
 * Support for UPDATEs.
-* Suppressing NULL columns in output.
 * Handling auto-incrementing columns, e.g. nextval('sequence_name') in PostgreSQL.
 * ODBC driver to enable SQL Server.
 * Ability to specify custom connection string parameters (or entire connection string).
@@ -73,6 +73,8 @@ This gem is created by Mats Sigge and is under the MIT License.
 * Support for PostgreSQL
 * Support for MySQL
 * Pretty-printing SQL.
+* Suppressing NULL columns in output.
+* Selecting only some columns.
 
 
 ## History

data/features/dump_as_insert.feature

@@ -38,3 +38,23 @@ Feature: dump data as INSERT statements
         'thingy'
     );
     """
+
+  Scenario: suppress nulls
+    Given a database "foo.sqlite" with a table "numbers_and_strings" with the following data
+      | number[int] | string |
+      | 42          | <null> |
+    When I run `sqldump -d foo.sqlite -il numbers_and_strings`
+    Then it should pass with:
+    """
+    INSERT INTO numbers_and_strings (number) VALUES (42);
+    """
+
+  Scenario: select specific columns
+    Given a database "foo.sqlite" with a table "numbers_strings_and_things" with the following data
+      | number[int] | string | thing |
+      | 42          | foo    | bar   |
+    When I run `sqldump -d foo.sqlite -is "number,thing" numbers_strings_and_things`
+    Then it should pass with:
+    """
+    INSERT INTO numbers_strings_and_things (number, thing) VALUES (42, 'bar');
+    """

data/lib/sqldump/insert_formatter.rb

@@ -25,10 +25,6 @@ module Sqldump
       @io.print "\n" if pretty
     end
 
-    def output_column_names
-      output_list(@sth.column_names)
-    end
-
     def output_values(row)
       quoted_list = []
       row.each_with_name do |value, column_name|
@@ -38,14 +34,27 @@ module Sqldump
       #@io.print quoted_list.join(", ")
     end
 
+    def cols_and_values(row)
+      cols = []
+      values = []
+      row.each_with_name do |value, column_name|
+        unless @options.suppress_nulls && value.nil?
+          cols.push column_name
+          values.push quote(value, column_name)
+        end
+      end
+      [cols, values]
+    end
+
     def output
       @sth.fetch do |row|
+        (cols, values) = cols_and_values(row)
         @io.print("INSERT INTO #{@options.table} (")
-        output_column_names()
+        output_list(cols)
         @io.print ")"
         @io.print pretty ? "\n" : " "
         @io.print "VALUES ("
-        output_values(row)
+        output_list(values)
         @io.print ");\n"
       end
     end

data/lib/sqldump/options.rb

@@ -16,6 +16,8 @@ module Sqldump
     attr_accessor :csv_header
     attr_accessor :dump_mode
     attr_accessor :pretty
+    attr_accessor :suppress_nulls
+    attr_accessor :columns_to_select
 
     def initialize(argv)
       parse_options(argv)
@@ -26,7 +28,7 @@ module Sqldump
     def set_derived_options(argv)
       self.table = argv[0]
 
-      self.sql = "select * from " + argv.join(" ")
+      self.sql = "select #{columns_to_select} from " + argv.join(" ")
     end
 
     def parse_options(argv)
@@ -42,6 +44,7 @@ module Sqldump
       self.dump_mode = :csv
       self.database_type = :sqlite3
       self.host = 'localhost'
+      self.columns_to_select = '*'
     end
 
     def define_options
@@ -90,6 +93,14 @@ module Sqldump
           self.pretty = true
         end
 
+        opts.on('-l', '--suppress-nulls', 'Suppresses null columns in insert mode.') do
+          self.suppress_nulls = true
+        end
+
+        opts.on('-s', '--select-columns COLUMN[,COLUMN...]', 'Specifies which columns to select.') do |columns|
+          self.columns_to_select = columns
+        end
+
         opts.on('-H', '--header', 'Include column names in csv mode.') do
           self.csv_header = true
         end

data/lib/sqldump/version.rb

@@ -1,3 +1,3 @@
 module Sqldump
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/sqldump/insert_formatter_spec.rb

@@ -8,14 +8,19 @@ module Sqldump
 
     describe "#output" do
 
-      def formatter_example(expected_result, options = nil)
+      let :options do
+        options = double("Options")
+        options.stub(:table).and_return('numbers_and_strings')
+        options.stub(:pretty).and_return(false)
+        options.stub(:suppress_nulls).and_return(false)
+        options.stub(:columns_to_select).and_return("*")
+        options
+      end
+
+      def formatter_example(expected_result, opts = nil)
         strio = StringIO.new
 
-        unless options
-          options = double("Options")
-          options.stub(:table).and_return('numbers_and_strings')
-          options.stub(:pretty).and_return(false)
-        end
+        opts ||= options
 
         formatter = InsertFormatter.new(@sth, strio, options)
         formatter.output
@@ -41,8 +46,6 @@ module Sqldump
       end
 
       it "pretty-prints output with the pretty option" do
-        options = double("options")
-        options.stub(:table).and_return('numbers_and_strings')
         options.stub(:pretty).and_return(true)
         formatter_example(<<"EOT", options)
 INSERT INTO numbers_and_strings (
@@ -56,6 +59,13 @@ VALUES (
 EOT
       end
 
+      it "removes null columns and values with the suppress nulls option" do
+        options.stub(:suppress_nulls).and_return(true)
+        @dbh.do("update numbers_and_strings set string = null")
+        @sth.finish
+        @sth = @dbh.execute "select * from numbers_and_strings"
+        formatter_example("INSERT INTO numbers_and_strings (number) VALUES (42);\n", options)
+      end
     end
 
     describe "#quote" do

data/spec/sqldump/options_spec.rb

@@ -118,6 +118,21 @@ module Sqldump
         options.pretty.should be_true
       end
     end
+
+    describe '-l --suppress-nulls option' do
+      it "sets the suppress_nulls flag" do
+        options = make_options(%w(-l))
+        options.suppress_nulls.should be_true
+      end
+    end
+
+    describe '-s --select-columns option' do
+      it "sets the selected columns" do
+        options = make_options(%w(-s foo,bar))
+        options.columns_to_select.should == "foo,bar"
+        options.sql.should == "select foo,bar from table"
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqldump
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &2160964240 !ruby/object:Gem::Requirement
+  requirement: &2156508360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160964240
+  version_requirements: *2156508360
 - !ruby/object:Gem::Dependency
   name: dbd-sqlite3
-  requirement: &2160963440 !ruby/object:Gem::Requirement
+  requirement: &2156507400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160963440
+  version_requirements: *2156507400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160962740 !ruby/object:Gem::Requirement
+  requirement: &2156506720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160962740
+  version_requirements: *2156506720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2160961720 !ruby/object:Gem::Requirement
+  requirement: &2156505760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160961720
+  version_requirements: *2156505760
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2160960920 !ruby/object:Gem::Requirement
+  requirement: &2156504980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160960920
+  version_requirements: *2156504980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2160959940 !ruby/object:Gem::Requirement
+  requirement: &2156504160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160959940
+  version_requirements: *2156504160
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2160958740 !ruby/object:Gem::Requirement
+  requirement: &2156503140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160958740
+  version_requirements: *2156503140
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2160956780 !ruby/object:Gem::Requirement
+  requirement: &2156501720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160956780
+  version_requirements: *2156501720
 - !ruby/object:Gem::Dependency
   name: dbd-pg
-  requirement: &2160955100 !ruby/object:Gem::Requirement
+  requirement: &2156499340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160955100
+  version_requirements: *2156499340
 description: A command line tool to generate SQL insert or update statements from
   the data in a database.
 email:
@@ -127,6 +127,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE
+- NOTES
 - README.md
 - Rakefile
 - bin/sqldump