sqldump 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,4 +1,10 @@
-Version 0.0.1
+Version 0.0.3
+-------------
+
+- Added pretty print option for SQL output.
+
+
+Version 0.0.2
 -------------
 
 New

data/README.md

@@ -55,7 +55,6 @@ This gem is created by Mats Sigge and is under the MIT License.
 ###Immediate goals
 * Selecting only some columns.
 * Support for UPDATEs.
-* Pretty-printing SQL.
 * Suppressing NULL columns in output.
 * Handling auto-incrementing columns, e.g. nextval('sequence_name') in PostgreSQL.
 * ODBC driver to enable SQL Server.
@@ -73,6 +72,7 @@ This gem is created by Mats Sigge and is under the MIT License.
 * Support for SQLite3
 * Support for PostgreSQL
 * Support for MySQL
+* Pretty-printing SQL.
 
 
 ## History

data/features/dump_as_csv.feature

@@ -1,7 +1,7 @@
 Feature: dump as csv
 
   The default mode of operation of sqldump is to output data in CSV
-√
+
   Scenario: one-column, one-row table
     Given a database "foo.sqlite" with a table "number" with the following data
       | number[int] |

data/features/dump_as_insert.feature

@@ -21,3 +21,20 @@ Feature: dump data as INSERT statements
     """
     INSERT INTO number (number) VALUES (NULL);
     """
+
+  Scenario: pretty print
+    Given a database "foo.sqlite" with a table "numbers_and_strings" with the following data
+      | number[int] | string |
+      | 42          | thingy |
+    When I run `sqldump -d foo.sqlite -it numbers_and_strings`
+    Then it should pass with:
+    """
+    INSERT INTO numbers_and_strings (
+        number,
+        string
+    )
+    VALUES (
+        42,
+        'thingy'
+    );
+    """

data/lib/sqldump/insert_formatter.rb

@@ -18,8 +18,15 @@ module Sqldump
       @column_type_by_name[column_name]
     end
 
+    def output_list(list)
+      @io.print "\n#{indent}" if pretty
+      join_string = pretty ? ",\n#{indent}" : ", "
+      @io.print list.join(join_string)
+      @io.print "\n" if pretty
+    end
+
     def output_column_names
-      @io.print @sth.column_names.join(", ")
+      output_list(@sth.column_names)
     end
 
     def output_values(row)
@@ -27,14 +34,17 @@ module Sqldump
       row.each_with_name do |value, column_name|
         quoted_list.push quote(value, column_name)
       end
-      @io.print quoted_list.join(", ")
+      output_list(quoted_list)
+      #@io.print quoted_list.join(", ")
     end
 
     def output
       @sth.fetch do |row|
         @io.print("INSERT INTO #{@options.table} (")
         output_column_names()
-        @io.print ") VALUES ("
+        @io.print ")"
+        @io.print pretty ? "\n" : " "
+        @io.print "VALUES ("
         output_values(row)
         @io.print ");\n"
       end
@@ -54,6 +64,14 @@ module Sqldump
       end
     end
 
+    def indent
+      " " * 4
+    end
+
+    def pretty
+      @options.pretty
+    end
+
   end
 
 end

data/lib/sqldump/options.rb

@@ -15,6 +15,7 @@ module Sqldump
     attr_accessor :sql
     attr_accessor :csv_header
     attr_accessor :dump_mode
+    attr_accessor :pretty
 
     def initialize(argv)
       parse_options(argv)
@@ -85,6 +86,10 @@ module Sqldump
           self.dump_mode = :insert
         end
 
+        opts.on('-t', '--pretty', 'Pretty-print SQL output (i.e. columns on separate lines, indentation).') do
+          self.pretty = true
+        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.2"
+  VERSION = "0.0.3"
 end

data/spec/sqldump/insert_formatter_spec.rb

@@ -8,11 +8,14 @@ module Sqldump
 
     describe "#output" do
 
-      def formatter_example(expected_result)
+      def formatter_example(expected_result, options = nil)
         strio = StringIO.new
 
-        options = double("Options")
-        options.stub(:table).and_return('numbers_and_strings')
+        unless options
+          options = double("Options")
+          options.stub(:table).and_return('numbers_and_strings')
+          options.stub(:pretty).and_return(false)
+        end
 
         formatter = InsertFormatter.new(@sth, strio, options)
         formatter.output
@@ -37,6 +40,22 @@ module Sqldump
         formatter_example("INSERT INTO numbers_and_strings (number, string) VALUES (42, 'thingy');\n")
       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 (
+    number,
+    string
+)
+VALUES (
+    42,
+    'thingy'
+);
+EOT
+      end
+
     end
 
     describe "#quote" do

data/spec/sqldump/options_spec.rb

@@ -62,7 +62,7 @@ module Sqldump
 
     end
 
-    describe 'username' do
+    describe '-U --username' do
       it 'sets the username to nil if not specified' do
         options = make_options([])
         options.username.should be_nil
@@ -74,7 +74,7 @@ module Sqldump
       end
     end
 
-    describe 'password' do
+    describe '-P --password' do
       it 'sets the password to nil if not specified' do
         options = make_options([])
         options.password.should be_nil
@@ -93,7 +93,7 @@ module Sqldump
       end
     end
 
-    describe 'csv header option' do
+    describe '-H --header : csv header option' do
       it "the csv_header flag is false by default" do
         options = make_options([])
         options.csv_header.should be_false
@@ -105,13 +105,19 @@ module Sqldump
       end
     end
 
-    describe 'insert mode option' do
+    describe '-i --insert : insert mode option' do
       it "sets the mode to :insert" do
         options = make_options(%w(-i table))
         options.dump_mode.should == :insert
       end
     end
 
+    describe '-t --pretty : pretty print option' do
+      it "sets the pretty flag" do
+        options = make_options(%w(-t))
+        options.pretty.should be_true
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqldump
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &2152906260 !ruby/object:Gem::Requirement
+  requirement: &2160964240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152906260
+  version_requirements: *2160964240
 - !ruby/object:Gem::Dependency
   name: dbd-sqlite3
-  requirement: &2152905460 !ruby/object:Gem::Requirement
+  requirement: &2160963440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152905460
+  version_requirements: *2160963440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152897840 !ruby/object:Gem::Requirement
+  requirement: &2160962740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152897840
+  version_requirements: *2160962740
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152896120 !ruby/object:Gem::Requirement
+  requirement: &2160961720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152896120
+  version_requirements: *2160961720
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152895320 !ruby/object:Gem::Requirement
+  requirement: &2160960920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152895320
+  version_requirements: *2160960920
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152894720 !ruby/object:Gem::Requirement
+  requirement: &2160959940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152894720
+  version_requirements: *2160959940
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2152893780 !ruby/object:Gem::Requirement
+  requirement: &2160958740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152893780
+  version_requirements: *2160958740
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152892500 !ruby/object:Gem::Requirement
+  requirement: &2160956780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152892500
+  version_requirements: *2160956780
 - !ruby/object:Gem::Dependency
   name: dbd-pg
-  requirement: &2152890760 !ruby/object:Gem::Requirement
+  requirement: &2160955100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152890760
+  version_requirements: *2160955100
 description: A command line tool to generate SQL insert or update statements from
   the data in a database.
 email: