sqldump 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,6 +1,16 @@
 Version 0.0.1
 -------------
 
+New
+- Added MySQL support.
+
+Bugfix
+- Actually use the host parameter for PostgreSQL/MySQL.
+
+
+Version 0.0.1
+-------------
+
 Initial version.
 - Very simple INSERT support.
 - CSV support.

data/Guardfile

@@ -4,3 +4,9 @@ guard 'rspec' do
   watch(%r{^lib/(.+)/(.+)\.rb$})    { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" }
   watch('spec/spec_helper.rb')      { "spec" }
 end
+
+guard 'cucumber' do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end

data/README.md

@@ -10,7 +10,11 @@ Just install the gem with
 $ gem install sqldump
 ```
 
-This will make the executable `sqldump` available from your command line.
+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.
+
+```bash
+$ gem install pg
+```
 
 **Requires Ruby 1.9.2 or later.**
 
@@ -49,12 +53,14 @@ This gem is created by Mats Sigge and is under the MIT License.
 ## Roadmap
 
 ###Immediate goals
-* More databases. At least MySQL and SQL Server.
-* Selecting only some columns
-* Support for UPDATEs
-* Pretty-printing SQL on multiple lines
-* Suppressing NULL columns in output
-* Handling auto-incrementing columns, e.g. nextval('sequence_name') in PostgreSQL
+* 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.
+* Ability to specify custom connection string parameters (or entire connection string).
+* If possible, detecting if the specified DBD driver is installed, to give a better error message.
 
 ###Longer-term goals / pipe dreams
 * Configuration system, e.g. .sqldump file
@@ -66,6 +72,8 @@ This gem is created by Mats Sigge and is under the MIT License.
 * Initial support for dumping INSERTs
 * Support for SQLite3
 * Support for PostgreSQL
+* Support for MySQL
+
 
 ## History
 

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+require "cucumber/rake/task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+Cucumber::Rake::Task.new(:cucumber) do |task|
+  task.cucumber_opts = ["features"]
+end
+
+task default: :spec

data/features/database_types.feature

@@ -19,7 +19,7 @@ Feature: dump data from different database types (e.g. MySQL, PostgreSQL, SQLite
       | 17          |
       | 42          |
       | 4711        |
-    When I run `sqldump -T postgresql -d numbers -S localhost -U mats numbers`
+    When I run `sqldump -T postgresql -d numbers -S localhost -U sqldump -P sqldump numbers`
     Then it should pass with:
     """
     17

data/features/support/env.rb

@@ -15,13 +15,12 @@ def drop_database_if_exists(driver, host, database, username, password)
 end
 
 def get_driver_string(driver)
-  driver_string = case driver
-                    when :sqlite3
-                      "SQLite3"
-                    when :postgresql
-                      "Pg"
-                  end
-  driver_string
+  case driver
+    when :sqlite3
+      "SQLite3"
+    when :postgresql
+      "Pg"
+  end
 end
 
 def create_and_connect_to_database(driver, host, database, username, password, &block)
@@ -48,8 +47,8 @@ def create_database(driver, host, database, username, password)
 end
 
 def create_dummy_database_with_data(driver, host, database, table_name, table_data)
-  username = 'mats'
-  password = nil
+  username = 'sqldump'
+  password = 'sqldump'
 
   in_current_dir do
     drop_database_if_exists(driver, host, database, username, password)

data/lib/sqldump/connector.rb

@@ -20,9 +20,12 @@ module Sqldump
     end
 
     def get_url
-      database = @options.database
       driver = get_driver
-      "DBI:#{driver}:#{database}"
+      url = "DBI:#{driver}:#{@options.database}"
+      if use_host
+        url += ":#{@options.host}"
+      end
+      url
     end
 
     def get_driver
@@ -31,9 +34,17 @@ module Sqldump
           "SQLite3"
         when :postgresql
           "Pg"
+        when :mysql
+          "Mysql"
+        else
+          raise "Unknown database type " + @options.database_type
       end
     end
 
+    def use_host
+      @options.database_type != :sqlite3
+    end
+
     def get_user
       @options.username
     end

data/lib/sqldump/options.rb

@@ -4,6 +4,8 @@ module Sqldump
 
   class Options
 
+    SUPPORTED_DATABASES = ['postgresql', 'mysql', 'sqlite3']
+
     attr_accessor :database
     attr_accessor :host
     attr_accessor :username
@@ -70,7 +72,12 @@ module Sqldump
         end
 
         opts.on('-T', '--dbtype TYPE', 'Specify the type of database to connect to. Supported types are sqlite3, postgresql/pg.') do |type|
+          type.downcase!
           type = 'postgresql' if type == 'pg'
+          unless SUPPORTED_DATABASES.include?(type)
+            puts "Unsupported database type #{type}"
+            exit
+          end
           self.database_type = type.to_sym
         end
 

data/lib/sqldump/version.rb

@@ -1,3 +1,3 @@
 module Sqldump
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/sqldump/connector_spec.rb

@@ -7,8 +7,9 @@ module Sqldump
 
     before(:each) do
       @options = double('options')
-      @options.stub(:database).and_return('database')
       @options.stub(:database_type).and_return(:sqlite3)
+      @options.stub(:database).and_return('database')
+      @options.stub(:host).and_return('localhost')
       @options.stub(:username).and_return(nil)
       @options.stub(:password).and_return(nil)
     end
@@ -40,7 +41,22 @@ module Sqldump
         @options.stub(:database_type).and_return(:postgresql)
 
         connector = Connector.new(@options)
-        connector.get_url.should == 'DBI:Pg:numbers'
+        connector.get_url.should == 'DBI:Pg:numbers:localhost'
+      end
+
+      it 'uses the Mysql driver when mysql is specified' do
+        @options.stub(:database).and_return('numbers')
+        @options.stub(:database_type).and_return(:mysql)
+
+        connector = Connector.new(@options)
+        connector.get_url.should == 'DBI:Mysql:numbers:localhost'
+      end
+
+      it "doesn't include the host for SQLite3" do
+        @options.stub(:database).and_return('numbers')
+
+        connector = Connector.new(@options)
+        connector.get_url.should == 'DBI:SQLite3:numbers'
       end
     end
 

data/spec/sqldump/insert_formatter_spec.rb

@@ -62,6 +62,10 @@ module Sqldump
         @formatter.quote(17, "number").should == 17
       end
 
+      it "returns NULL on a nil value" do
+        @formatter.quote(nil, "string").should == "NULL"
+      end
+
     end
 
   end

data/spec/sqldump/options_spec.rb

@@ -54,6 +54,12 @@ module Sqldump
         options = make_options(%w(-T pg))
         options.database_type.should == :postgresql
       end
+
+      it 'sets the type to mysql if specified' do
+        options = make_options(%w(-T mysql))
+        options.database_type.should == :mysql
+      end
+
     end
 
     describe 'username' do

data/sqldump.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |s|
   s.add_dependency "dbd-sqlite3"
   s.add_development_dependency "rspec"
   s.add_development_dependency "cucumber"
+  s.add_development_dependency "aruba"
   s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "guard-cucumber"
   s.add_development_dependency "rb-fsevent" if RUBY_PLATFORM =~ /darwin/i
   s.add_development_dependency "dbd-pg"
 end

metadata

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