From 0390d78efdfc4154bc431471ec49f4c6dcd9a9a1 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jeff.davis@gmail.com>
Date: Wed, 27 Oct 2010 13:45:51 -0400
Subject: [PATCH 01/25] treat mysql float as pg real

---
 mysql2psql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql2psql b/mysql2psql
index e75141c..3892936 100755
--- a/mysql2psql
+++ b/mysql2psql
@@ -103,7 +103,9 @@ class MysqlReader
         "varchar"
       when /char/
         "char"
-      when /(float|decimal)/
+      when /float/
+        "real"
+      when /decimal/
         "decimal"
       when /double/
          "double precision"
@@ -291,7 +293,7 @@ class PostgresWriter < Writer
     when "boolean"
       default = " DEFAULT #{column[:default].to_i == 1 ? 'true' : 'false'}" if default
       "boolean"
-    when "float"
+    when "real"
       default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default].to_f}" if default
       "real"
     when "float unsigned"

From a49cf08bd5aa23a771518c8bc2f837014344f187 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jeff.davis@gmail.com>
Date: Wed, 27 Oct 2010 14:11:25 -0400
Subject: [PATCH 02/25] dont guess at precision

---
 mysql2psql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql2psql b/mysql2psql
index 3892936..9e9f681 100755
--- a/mysql2psql
+++ b/mysql2psql
@@ -121,6 +121,7 @@ class MysqlReader
       fields = []
       @reader.mysql.query("EXPLAIN `#{name}`") do |res|
         while field = res.fetch_row do
+          length = -1
           length = field[1][/\((\d+)\)/, 1] if field[1] =~ /\((\d+)\)/
           length = field[1][/\((\d+),(\d+)\)/, 1] if field[1] =~ /\((\d+),(\d+)\)/
           desc = {

From 61bcbbf269b86373a39824b67a3168c4dc2b49a8 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jeff.davis@gmail.com>
Date: Wed, 27 Oct 2010 14:37:57 -0400
Subject: [PATCH 03/25] check number of tuples inserted on copy

---
 mysql2psql | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mysql2psql b/mysql2psql
index 9e9f681..d65f873 100755
--- a/mysql2psql
+++ b/mysql2psql
@@ -651,14 +651,22 @@ class PostgresDbWriter < PostgresWriter
       
       if counter % 5000 == 0
         @conn.put_copy_end
+        res = @conn.get_result
+        if res.cmdtuples != 5000
+          puts "\nWARNING: #{table.name} expected 5000 tuple inserts got #{res.cmdtuples} at row #{counter}\n"
+        end
         @conn.exec(copy_line)
       end
        
     end
-    _time2 = Time.now
-    puts "\n#{_counter} rows loaded in #{((_time2 - _time1) / 60).round}min #{((_time2 - _time1) % 60).round}s"
 #    @conn.putline(".\n")
     @conn.put_copy_end
+    res = @conn.get_result
+    if res.cmdtuples != (_counter % 5000)
+      puts "\nWARNING: table #{table.name} expected #{_counter % 5000} tuple inserts got #{res.cmdtuples}\n"
+    end
+    _time2 = Time.now
+    puts "\n#{table.name} #{_counter} rows loaded in #{((_time2 - _time1) / 60).round}min #{((_time2 - _time1) % 60).round}s"
   end
   
   def close

From 9dd8a2f75b8995befdc01c557ed2d3626e3db5f1 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jeff.davis@gmail.com>
Date: Thu, 28 Oct 2010 07:20:55 -0400
Subject: [PATCH 04/25] fix error on counting inserts for empty tables

---
 mysql2psql | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mysql2psql b/mysql2psql
index d65f873..25cc2bb 100755
--- a/mysql2psql
+++ b/mysql2psql
@@ -661,9 +661,11 @@ class PostgresDbWriter < PostgresWriter
     end
 #    @conn.putline(".\n")
     @conn.put_copy_end
-    res = @conn.get_result
-    if res.cmdtuples != (_counter % 5000)
-      puts "\nWARNING: table #{table.name} expected #{_counter % 5000} tuple inserts got #{res.cmdtuples}\n"
+    if _counter && (_counter % 5000) > 0
+      res = @conn.get_result
+      if res.cmdtuples != (_counter % 5000)
+        puts "\nWARNING: table #{table.name} expected #{_counter % 5000} tuple inserts got #{res.cmdtuples}\n"
+        end
     end
     _time2 = Time.now
     puts "\n#{table.name} #{_counter} rows loaded in #{((_time2 - _time1) / 60).round}min #{((_time2 - _time1) % 60).round}s"

From 2bfa98f421db7826ecdea0e29db3cfdc77ff6802 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Mon, 1 Nov 2010 22:45:17 +0800
Subject: [PATCH 05/25] clean up formatting

---
 README.rdoc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index ae6a0dc..1b81b80 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -11,7 +11,8 @@ to contact me, I'll help you.
 Mysql2psql is packaged as a gem. Install as usual (use sudo if required).
 
   $ gem install mysql2psql
-  NB: the gem hasn't been formally released on http://rubygems.org/ yet. For now you need to clone the git repo at http://github.com/tardate/mysql2postgres and 'rake install' 
+
+NB: the gem hasn't been formally released on http://rubygems.org/ yet. For now you need to clone the git repo at http://github.com/tardate/mysql2postgres and 'rake install'.  
 
 After installation, the "mysql2psql" command will be available. 
 When run, it will generate a default configuration file in the current directory if a config
@@ -60,6 +61,7 @@ The gem packaged version you are currently looking at has yet to be merged into
 The gem bundling and refactoring for testing was done by Paul Gallagher <gallagher.paul@gmail.com> and
 the repository is at http://github.com/tardate/mysql2postgres
 
+Gem packaging is done with Jeweler. Note that on windows this means you must run under mingw or other shell that supports git to do the gem bundling (but you can gem install the built gem in the normal Windows shell). 
 
 == Running tests
 If you fork/clone the project, you will want to run the test suite (and add to it if you are developing new features or fixing bugs).
@@ -80,6 +82,7 @@ mysql on localhost:3306
 - database created called "mysql2psql_test"
 - user setup for "mysql2psql" with no password
 - e.g. 
+
   mysqladmin -uroot -p create mysql2psql_test
   mysql -uroot -p -e "grant all on mysql2psql_test.* to 'mysql2psql'@'localhost';"
   # verify connecction:
@@ -89,6 +92,7 @@ postgres on localhost:5432
 - database created called "mysql2psql_test" 
 - role (user) access setup for "mysql2psql" with no password
 - e.g.
+
   psql postgres -c "create role mysql2psql with login"
   psql postgres -c "create database mysql2psql_test with owner mysql2psql encoding='UTF8'"
   # verify connection:
@@ -96,10 +100,9 @@ postgres on localhost:5432
 
 == Notes, Limitations, Outstanding Issues..
 
-Todo:
+=== Todo
 - more tests
 - release gem
-- a windows cmd shim
 
 === note from mgkimsal
 I'm still having trouble with bit(1)/boolean fields

From 6a4a8b7e71f118476d1d04f9622969256cd8492e Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Mon, 1 Nov 2010 22:48:10 +0800
Subject: [PATCH 06/25] factor out set serial sequence code to postgres_writer

---
 lib/mysql2psql/postgres_db_writer.rb   | 2 +-
 lib/mysql2psql/postgres_file_writer.rb | 5 ++---
 lib/mysql2psql/postgres_writer.rb      | 9 ++++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/mysql2psql/postgres_db_writer.rb b/lib/mysql2psql/postgres_db_writer.rb
index f636c9f..5dbbf67 100644
--- a/lib/mysql2psql/postgres_db_writer.rb
+++ b/lib/mysql2psql/postgres_db_writer.rb
@@ -65,7 +65,7 @@ def write_table(table)
         CACHE 1
       EOF
     
-      @conn.exec "SELECT pg_catalog.setval('#{table.name}_#{serial_key}_seq', #{maxval}, true)"
+      @conn.exec sqlfor_set_serial_sequence(table,serial_key,maxval)
     end
     
     if @conn.server_version < 80200
diff --git a/lib/mysql2psql/postgres_file_writer.rb b/lib/mysql2psql/postgres_file_writer.rb
index 12d39f4..5fc2ad7 100644
--- a/lib/mysql2psql/postgres_file_writer.rb
+++ b/lib/mysql2psql/postgres_file_writer.rb
@@ -33,7 +33,7 @@ def truncate(table)
 EOF
     if serial_key
     @f << <<-EOF
-SELECT pg_catalog.setval(pg_get_serial_sequence('#{table.name}', '#{serial_key}'), #{maxval}, true);
+#{sqlfor_reset_serial_sequence(table,serial_key,maxval)}
 EOF
     end
   end
@@ -69,8 +69,7 @@ def write_table(table)
     NO MINVALUE
     CACHE 1;
     
-    
-SELECT pg_catalog.setval('#{table.name}_#{serial_key}_seq', #{maxval}, true);
+#{sqlfor_set_serial_sequence(table,serial_key,maxval)} 
  
       EOF
     end
diff --git a/lib/mysql2psql/postgres_writer.rb b/lib/mysql2psql/postgres_writer.rb
index 9609ed4..6dc2f20 100644
--- a/lib/mysql2psql/postgres_writer.rb
+++ b/lib/mysql2psql/postgres_writer.rb
@@ -137,7 +137,14 @@ def process_row(table, row)
   
     def truncate(table)
     end
-  
+
+    def sqlfor_set_serial_sequence(table,serial_key,maxval)
+      "SELECT pg_catalog.setval('#{table.name}_#{serial_key}_seq', #{maxval}, true);"
+    end
+    def sqlfor_reset_serial_sequence(table,serial_key,maxval)
+      "SELECT pg_catalog.setval(pg_get_serial_sequence('#{table.name}', '#{serial_key}'), #{maxval}, true);"
+    end
+
   end
 
 end
\ No newline at end of file

From 9727863d945c0e738324730e3a07a59d944b27df Mon Sep 17 00:00:00 2001
From: Jeff Davis <jeff.davis@gmail.com>
Date: Thu, 4 Nov 2010 09:54:47 -0400
Subject: [PATCH 07/25] remerge of bug fixes

---
 lib/mysql2psql/mysql_reader.rb       |  7 +++++--
 lib/mysql2psql/postgres_db_writer.rb | 19 ++++++++++++++-----
 lib/mysql2psql/postgres_writer.rb    |  4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
index 98dc5e8..c343650 100644
--- a/lib/mysql2psql/mysql_reader.rb
+++ b/lib/mysql2psql/mysql_reader.rb
@@ -43,7 +43,9 @@ def convert_type(type)
           "varchar"
         when /char/
           "char"
-        when /(float|decimal)/
+        when /float/
+          "real"
+        when /decimal/
           "decimal"
         when /double/
            "double precision"
@@ -59,6 +61,7 @@ def load_columns
         fields = []
         @reader.mysql.query("EXPLAIN `#{name}`") do |res|
           while field = res.fetch_row do
+            length = -1
             length = field[1][/\((\d+)\)/, 1] if field[1] =~ /\((\d+)\)/
             length = field[1][/\((\d+),(\d+)\)/, 1] if field[1] =~ /\((\d+),(\d+)\)/
             desc = {
@@ -188,4 +191,4 @@ def paginated_read(table, page_size)
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/lib/mysql2psql/postgres_db_writer.rb b/lib/mysql2psql/postgres_db_writer.rb
index f636c9f..a861e21 100644
--- a/lib/mysql2psql/postgres_db_writer.rb
+++ b/lib/mysql2psql/postgres_db_writer.rb
@@ -164,16 +164,25 @@ def write_contents(table, reader)
       
       if counter % 5000 == 0
         @conn.put_copy_end
+        res = @conn.get_result
+        if res.cmdtuples != 5000
+          puts "\nWARNING: #{table.name} expected 5000 tuple inserts got #{res.cmdtuples} at row #{counter}\n"
+        end
         @conn.exec(copy_line)
       end
        
     end
-    _time2 = Time.now
-    puts "\n#{_counter} rows loaded in #{((_time2 - _time1) / 60).round}min #{((_time2 - _time1) % 60).round}s"
-#    @conn.putline(".\n")
     @conn.put_copy_end
+    if _counter && (_counter % 5000) > 0
+      res = @conn.get_result
+      if res.cmdtuples != (_counter % 5000)
+        puts "\nWARNING: table #{table.name} expected #{_counter % 5000} tuple inserts got #{res.cmdtuples}\n"
+      end
+    end
+    _time2 = Time.now
+    puts "\n#{table.name} #{_counter} rows loaded in #{((_time2 - _time1) / 60).round}min #{((_time2 - _time1) % 60).round}s"
   end
-  
+
 end
 
-end
\ No newline at end of file
+end
diff --git a/lib/mysql2psql/postgres_writer.rb b/lib/mysql2psql/postgres_writer.rb
index 9609ed4..96da0a4 100644
--- a/lib/mysql2psql/postgres_writer.rb
+++ b/lib/mysql2psql/postgres_writer.rb
@@ -46,7 +46,7 @@ def column_type_info(column)
       when "boolean"
         default = " DEFAULT #{column[:default].to_i == 1 ? 'true' : 'false'}" if default
         "boolean"
-      when "float"
+      when "real"
         default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default].to_f}" if default
         "real"
       when "float unsigned"
@@ -140,4 +140,4 @@ def truncate(table)
   
   end
 
-end
\ No newline at end of file
+end

From 7b48c1caf99ac90286f4ab2f355d3f568dd95373 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 00:12:05 +0800
Subject: [PATCH 08/25] allow default of no socket to be entered

---
 lib/mysql2psql/config.rb             | 2 +-
 lib/mysql2psql/mysql_reader.rb       | 2 +-
 test/fixtures/config_all_options.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/mysql2psql/config.rb b/lib/mysql2psql/config.rb
index 07f6c69..6733f73 100644
--- a/lib/mysql2psql/config.rb
+++ b/lib/mysql2psql/config.rb
@@ -32,7 +32,7 @@ def self.template(to_filename = nil, include_tables = [], exclude_tables = [], s
 mysql:
  hostname: localhost
  port: 3306
- socket: /tmp/mysql.sock
+ socket:
  username: mysql2psql
  password: 
  database: mysql2psql_test
diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
index 98dc5e8..fab00ae 100644
--- a/lib/mysql2psql/mysql_reader.rb
+++ b/lib/mysql2psql/mysql_reader.rb
@@ -162,7 +162,7 @@ def initialize(options)
       @host, @user, @passwd, @db, @port, @sock, @flag = 
         options.mysqlhostname('localhost'), options.mysqlusername, 
         options.mysqlpassword, options.mysqldatabase, 
-        options.mysqlport, options.mysqlsocket
+        options.mysqlport, options.mysqlsocket(nil)
       connect
     end
   
diff --git a/test/fixtures/config_all_options.yml b/test/fixtures/config_all_options.yml
index 06d0b83..cdb1be2 100644
--- a/test/fixtures/config_all_options.yml
+++ b/test/fixtures/config_all_options.yml
@@ -1,7 +1,7 @@
 mysql:
  hostname: localhost
  port: 3306
- socket: /tmp/mysql.sock
+ socket:
  username: somename
  password: secretpassword
  database: somename 

From fc54c746b2bd7f6ad02a186c9927bce327fc4424 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 00:13:30 +0800
Subject: [PATCH 09/25] ignore redcar, rvmrc configurations

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index d3a0169..684c0dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 configs
 test/fixtures/test*.sql
 pkg
+.redcar
+.rvmrc
+

From e01f5df3d6965327479eb94033e798d6d725c817 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 00:14:10 +0800
Subject: [PATCH 10/25] add basic auto-increment test (for file coversions)

---
 test/fixtures/seed_integration_tests.sql | 10 ++++++++++
 test/integration/convert_to_file_test.rb | 14 +++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/seed_integration_tests.sql b/test/fixtures/seed_integration_tests.sql
index 8163255..59a2dea 100644
--- a/test/fixtures/seed_integration_tests.sql
+++ b/test/fixtures/seed_integration_tests.sql
@@ -22,3 +22,13 @@ INSERT INTO numeric_types_basics VALUES
 (23,23,23,23,23,23,23,23,23,23,23,23);
 
 
+DROP TABLE IF EXISTS basic_autoincrement;
+CREATE TABLE basic_autoincrement (
+  auto_id INT(11) NOT NULL AUTO_INCREMENT,
+	auto_dummy INT,
+	PRIMARY KEY (auto_id)
+);
+
+INSERT INTO basic_autoincrement(auto_dummy) VALUES
+(1),(2),(23);
+
diff --git a/test/integration/convert_to_file_test.rb b/test/integration/convert_to_file_test.rb
index f7c440c..0a2db69 100644
--- a/test/integration/convert_to_file_test.rb
+++ b/test/integration/convert_to_file_test.rb
@@ -5,6 +5,12 @@
 class ConvertToFileTest < Test::Unit::TestCase
 
   class << self
+
+    # This is a suite of tests to verify conversion of full schema and data to file.
+    # The export is done once in the class setup.
+    # Tests inspect specific features of the converted file,
+    # the contents of which are preloaded as the :content attribute of this class
+    #
     def startup
       seed_test_database
       @@options=get_test_config_by_label(:localmysql_to_file_convert_all)
@@ -23,12 +29,14 @@ def teardown
   def content
     @@content
   end
-  
+
+  # verify table creation
   def test_table_creation
     assert_not_nil content.match('DROP TABLE IF EXISTS "numeric_types_basics" CASCADE')
     assert_not_nil content.match(/CREATE TABLE "numeric_types_basics"/)
   end
 
+  # tests for the conversion of numeric types
   def test_basic_numerics_tinyint
     assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_tinyint" smallint,.*\)', Regexp::MULTILINE).match( content )
   end
@@ -63,4 +71,8 @@ def test_basic_numerics_numeric
     assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_numeric" numeric\(10, 0\)[\w\n]*\)', Regexp::MULTILINE).match( content )
   end
 
+  # test autoincrement handling
+  def test_autoincrement
+    assert_not_nil Regexp.new('CREATE TABLE "basic_autoincrement".*"auto_id" integer DEFAULT.*\)', Regexp::MULTILINE).match( content )
+  end
 end
\ No newline at end of file

From 8d8883b8338958b9c8b80cab3e2d8b902d0e72d6 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 00:14:21 +0800
Subject: [PATCH 11/25] fix indenting

---
 README.rdoc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 1b81b80..39eed70 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -110,11 +110,11 @@ workaround I've found is to put output in file
 then in VIM on file, search/replace the true/false binary fields with t/f
 specifically
 
-(reversed on 3/23 - should be ^A gets f)
-:%s/^@/t/g
-:%s/^A/f/g
-keystrokes are ctrl-v ctrl-shift-@ to get the 'true' binary field
-keystrokes are ctrl-v ctrl-shift-A to get the 'false' binary field
+  (reversed on 3/23 - should be ^A gets f)
+  :%s/^@/t/g
+  :%s/^A/f/g
+  keystrokes are ctrl-v ctrl-shift-@ to get the 'true' binary field
+  keystrokes are ctrl-v ctrl-shift-A to get the 'false' binary field
 
 == Contributors
 Project founded by Max Lapshin <max@maxidoors.ru>

From c4b20c20b3e30dc4ba8ff2a2f5d551b81aeb2ec9 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 00:52:28 +0800
Subject: [PATCH 12/25] floats and reals should migrate to double precision
 (although floats _may_ be single - depending on precision - currently taking
 the safe route and migrate all to double)

---
 lib/mysql2psql/mysql_reader.rb           |  6 ++++--
 lib/mysql2psql/postgres_writer.rb        |  5 ++---
 test/fixtures/seed_integration_tests.sql | 15 ++++++++++++---
 test/integration/convert_to_db_test.rb   |  2 ++
 test/integration/convert_to_file_test.rb |  3 ++-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
index fab00ae..4f47e68 100644
--- a/lib/mysql2psql/mysql_reader.rb
+++ b/lib/mysql2psql/mysql_reader.rb
@@ -43,9 +43,11 @@ def convert_type(type)
           "varchar"
         when /char/
           "char"
-        when /(float|decimal)/
+        when /decimal/
           "decimal"
-        when /double/
+        when /float/
+          "float"
+        when /real|double/
            "double precision"
         else
           type
diff --git a/lib/mysql2psql/postgres_writer.rb b/lib/mysql2psql/postgres_writer.rb
index 6dc2f20..cfda61b 100644
--- a/lib/mysql2psql/postgres_writer.rb
+++ b/lib/mysql2psql/postgres_writer.rb
@@ -29,7 +29,6 @@ def column_type_info(column)
         "character(#{column[:length]})"
       when "varchar"
         default = default + "::character varying" if default
-  #      puts "VARCHAR: #{column.inspect}"
         "character varying(#{column[:length]})"
       
       # Integer and numeric types
@@ -48,10 +47,10 @@ def column_type_info(column)
         "boolean"
       when "float"
         default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default].to_f}" if default
-        "real"
+        "double precision"
       when "float unsigned"
         default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default].to_f}" if default
-        "real"
+        "double precision"
       when "decimal"
         default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default]}" if default
         "numeric(#{column[:length] || 10}, #{column[:decimals] || 0})"
diff --git a/test/fixtures/seed_integration_tests.sql b/test/fixtures/seed_integration_tests.sql
index 59a2dea..dc89e15 100644
--- a/test/fixtures/seed_integration_tests.sql
+++ b/test/fixtures/seed_integration_tests.sql
@@ -12,14 +12,15 @@ CREATE TABLE numeric_types_basics (
 	f_real REAL,
 	f_double DOUBLE,
 	f_float FLOAT,
+	f_ufloat FLOAT UNSIGNED,
 	f_decimal DECIMAL,
 	f_numeric NUMERIC
 );
 
 INSERT INTO numeric_types_basics VALUES
-(1,1,1,1,1,1,1,1,1,1,1,1),
-(2,2,2,2,2,2,2,2,2,2,2,2),
-(23,23,23,23,23,23,23,23,23,23,23,23);
+(1,1,1,1,1,1,1,1,1,1,1,1,1),
+(2,2,2,2,2,2,2,2,2,2,2,2,2),
+(23,23,23,23,23,23,23,23,23,23,23,23,23);
 
 
 DROP TABLE IF EXISTS basic_autoincrement;
@@ -32,3 +33,11 @@ CREATE TABLE basic_autoincrement (
 INSERT INTO basic_autoincrement(auto_dummy) VALUES
 (1),(2),(23);
 
+DROP TABLE IF EXISTS numeric_type_floats;
+CREATE TABLE numeric_type_floats (
+ latitude FLOAT,
+ longitude FLOAT
+);
+
+INSERT INTO numeric_type_floats(latitude,longitude) VALUES
+(1.1,2.2);
diff --git a/test/integration/convert_to_db_test.rb b/test/integration/convert_to_db_test.rb
index 249c45e..47190a0 100644
--- a/test/integration/convert_to_db_test.rb
+++ b/test/integration/convert_to_db_test.rb
@@ -24,6 +24,8 @@ def teardown
 
   def test_table_creation
     assert_true @@mysql2psql.writer.exists?('numeric_types_basics')
+    assert_true @@mysql2psql.writer.exists?('basic_autoincrement')
+    assert_true @@mysql2psql.writer.exists?('numeric_type_floats')
   end
 
 end
\ No newline at end of file
diff --git a/test/integration/convert_to_file_test.rb b/test/integration/convert_to_file_test.rb
index 0a2db69..58087ec 100644
--- a/test/integration/convert_to_file_test.rb
+++ b/test/integration/convert_to_file_test.rb
@@ -62,7 +62,8 @@ def test_basic_numerics_double
     assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_double" double precision,.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_float
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float" numeric\(20, 0\),.*\)', Regexp::MULTILINE).match( content )
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float" double precision.*\)', Regexp::MULTILINE).match( content )
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_ufloat" double precision.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_decimal
     assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_decimal" numeric\(10, 0\),.*\)', Regexp::MULTILINE).match( content )

From 1d44286ca464d6c7db8cde93bd72858b5190448b Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 00:58:41 +0800
Subject: [PATCH 13/25] readme format fixup

---
 README.rdoc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 39eed70..7d3b476 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -81,23 +81,27 @@ Running the integration tests *will* rewrite data and schema for the "mysql2psql
 mysql on localhost:3306
 - database created called "mysql2psql_test"
 - user setup for "mysql2psql" with no password
-- e.g. 
+
+e.g.
 
   mysqladmin -uroot -p create mysql2psql_test
   mysql -uroot -p -e "grant all on mysql2psql_test.* to 'mysql2psql'@'localhost';"
   # verify connecction:
   mysql -umysql2psql -e "select database(),'yes' as connected" mysql2psql_test
-  
+
+
 postgres on localhost:5432
 - database created called "mysql2psql_test" 
 - role (user) access setup for "mysql2psql" with no password
-- e.g.
+
+e.g.
 
   psql postgres -c "create role mysql2psql with login"
   psql postgres -c "create database mysql2psql_test with owner mysql2psql encoding='UTF8'"
   # verify connection:
   psql mysql2psql_test -U mysql2psql -c "\c"
 
+
 == Notes, Limitations, Outstanding Issues..
 
 === Todo

From ee7cb8ecfb33c5e72dc355ca11d04c74c858dc7c Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 04:05:15 +0800
Subject: [PATCH 14/25] revised/corrected integer signed/unsigned conversions

---
 lib/mysql2psql/mysql_reader.rb           | 12 +++--
 lib/mysql2psql/postgres_writer.rb        |  5 +--
 test/fixtures/seed_integration_tests.sql | 31 +++++++++++--
 test/integration/convert_to_file_test.rb | 56 +++++++++++++++++++-----
 test/integration/mysql_reader_test.rb    |  2 +-
 5 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
index 9bc8471..0c4a182 100644
--- a/lib/mysql2psql/mysql_reader.rb
+++ b/lib/mysql2psql/mysql_reader.rb
@@ -27,15 +27,21 @@ def columns
     
       def convert_type(type)
         case type
-        when /int.* unsigned/
+        when /^int.* unsigned/
           "bigint"
         when /bigint/
           "bigint"
         when "bit(1)"
           "boolean"
+        when /smallint.* unsigned/
+          "integer"
+        when /smallint/
+          "smallint"
         when "tinyint(1)"
           "boolean"
-        when /tinyint/
+        when "tinyint(3) unsigned"
+          "tinyint"
+        when "tinyint(4)"
           "tinyint"
         when /int/
           "integer"
@@ -74,7 +80,7 @@ def load_columns
               :primary_key => field[3] == "PRI",
               :auto_increment => field[5] == "auto_increment"
               }
-            desc[:default] = field[4] unless field[4].nil?
+            desc[:default] = field[4] unless field[4].nil?            
             fields << desc
           end
         end
diff --git a/lib/mysql2psql/postgres_writer.rb b/lib/mysql2psql/postgres_writer.rb
index 1dd504a..847478f 100644
--- a/lib/mysql2psql/postgres_writer.rb
+++ b/lib/mysql2psql/postgres_writer.rb
@@ -16,8 +16,7 @@ def column_type(column)
     def column_type_info(column)
       if column[:auto_increment]
         return "integer DEFAULT nextval('#{column[:table_name]}_#{column[:name]}_seq'::regclass) NOT NULL"
-      end
-    
+      end      
       default = column[:default] ? " DEFAULT #{column[:default] == nil ? 'NULL' : "'"+PGconn.escape(column[:default])+"'"}" : nil
       null = column[:null] ? "" : " NOT NULL"
       type = 
@@ -38,7 +37,7 @@ def column_type_info(column)
       when "bigint"
         default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default].to_i}" if default
         "bigint"
-      when "tinyint"
+      when /tinyint|smallint/
         default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default].to_i}" if default
         "smallint"
     
diff --git a/test/fixtures/seed_integration_tests.sql b/test/fixtures/seed_integration_tests.sql
index dc89e15..58dc8a7 100644
--- a/test/fixtures/seed_integration_tests.sql
+++ b/test/fixtures/seed_integration_tests.sql
@@ -4,23 +4,31 @@ DROP TABLE IF EXISTS numeric_types_basics;
 CREATE TABLE numeric_types_basics (
   id int,
 	f_tinyint TINYINT,
+	f_tinyint_u TINYINT UNSIGNED,
 	f_smallint SMALLINT,
+	f_smallint_u SMALLINT UNSIGNED,
 	f_mediumint MEDIUMINT,
+	f_mediumint_u MEDIUMINT UNSIGNED,
 	f_int INT,
+	f_int_u INT UNSIGNED,
 	f_integer INTEGER,
+	f_integer_u INTEGER UNSIGNED,
 	f_bigint BIGINT,
+	f_bigint_u BIGINT UNSIGNED,
 	f_real REAL,
 	f_double DOUBLE,
 	f_float FLOAT,
-	f_ufloat FLOAT UNSIGNED,
+	f_float_u FLOAT UNSIGNED,
 	f_decimal DECIMAL,
 	f_numeric NUMERIC
 );
 
 INSERT INTO numeric_types_basics VALUES
-(1,1,1,1,1,1,1,1,1,1,1,1,1),
-(2,2,2,2,2,2,2,2,2,2,2,2,2),
-(23,23,23,23,23,23,23,23,23,23,23,23,23);
+( 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19),
+( 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
+( 3,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23),
+( 4, -128,   0,-32768,     0,-8388608,        0,-2147483648,          0,-2147483648,          0,-9223372036854775808,                    0, 1, 1, 1, 1, 1, 1),
+( 5,  127, 255, 32767, 65535, 8388607, 16777215, 2147483647, 4294967295, 2147483647, 4294967295, 9223372036854775807, 18446744073709551615, 1, 1, 1, 1, 1, 1);
 
 
 DROP TABLE IF EXISTS basic_autoincrement;
@@ -33,6 +41,7 @@ CREATE TABLE basic_autoincrement (
 INSERT INTO basic_autoincrement(auto_dummy) VALUES
 (1),(2),(23);
 
+-- see GH#22 float conversion error
 DROP TABLE IF EXISTS numeric_type_floats;
 CREATE TABLE numeric_type_floats (
  latitude FLOAT,
@@ -41,3 +50,17 @@ CREATE TABLE numeric_type_floats (
 
 INSERT INTO numeric_type_floats(latitude,longitude) VALUES
 (1.1,2.2);
+
+-- see GH#18 smallint error
+DROP TABLE IF EXISTS gh18_smallint;
+CREATE TABLE gh18_smallint (
+ s_smallint SMALLINT,
+ u_smallint SMALLINT UNSIGNED
+);
+
+INSERT INTO gh18_smallint(s_smallint,u_smallint) VALUES
+(-32768,32767),
+(-1,0),
+(32767,65535);
+
+
diff --git a/test/integration/convert_to_file_test.rb b/test/integration/convert_to_file_test.rb
index 58087ec..8364701 100644
--- a/test/integration/convert_to_file_test.rb
+++ b/test/integration/convert_to_file_test.rb
@@ -37,39 +37,71 @@ def test_table_creation
   end
 
   # tests for the conversion of numeric types
+  def get_basic_numerics_match(column)
+    Regexp.new('CREATE TABLE "numeric_types_basics".*"' + column + '" ([^\n]*).*\)', Regexp::MULTILINE).match( content )
+  end
   def test_basic_numerics_tinyint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_tinyint" smallint,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_tinyint' )    
+    assert_match /smallint/,match[1]
+  end
+  def test_basic_numerics_tinyint_u   
+    match = get_basic_numerics_match( 'f_tinyint_u' )    
+    assert_match /smallint/,match[1]
   end
   def test_basic_numerics_smallint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_smallint" integer,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_smallint' )    
+    assert_match /smallint/,match[1]
+  end
+  def test_basic_numerics_smallint_u
+    match = get_basic_numerics_match( 'f_smallint_u' )    
+    assert_match /integer/,match[1]
   end
   def test_basic_numerics_mediumint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_mediumint" integer,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_mediumint' )    
+    assert_match /integer/,match[1]  
   end
   def test_basic_numerics_int
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_int" integer,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_int' )    
+    assert_match /integer/,match[1]   
   end
   def test_basic_numerics_integer
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_integer" integer,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_integer' )    
+    assert_match /integer/,match[1] 
   end
   def test_basic_numerics_bigint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_bigint" bigint,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_bigint' )        
+    assert_match /bigint/,match[1]
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_bigint" bigint,.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_real
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_real" double precision,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_real' )    
+    assert_match /double precision/,match[1]    
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_real" double precision,.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_double
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_double" double precision,.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_double' )    
+    assert_match /double precision/,match[1]  
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_double" double precision,.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_float
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float" double precision.*\)', Regexp::MULTILINE).match( content )
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_ufloat" double precision.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_float' )    
+    assert_match /double precision/,match[1]   
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float" double precision.*\)', Regexp::MULTILINE).match( content )    
+  end
+  def test_basic_numerics_float_u    
+    match = get_basic_numerics_match( 'f_float_u' )    
+    assert_match /double precision/,match[1]  
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float_u" double precision.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_decimal
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_decimal" numeric\(10, 0\),.*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_decimal' )    
+    assert_match /numeric/,match[1] 
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_decimal" numeric\(10, 0\),.*\)', Regexp::MULTILINE).match( content )
   end
   def test_basic_numerics_numeric
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_numeric" numeric\(10, 0\)[\w\n]*\)', Regexp::MULTILINE).match( content )
+    match = get_basic_numerics_match( 'f_numeric' )    
+    assert_match /numeric/,match[1]    
+    #assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_numeric" numeric\(10, 0\)[\w\n]*\)', Regexp::MULTILINE).match( content )
   end
 
   # test autoincrement handling
diff --git a/test/integration/mysql_reader_test.rb b/test/integration/mysql_reader_test.rb
index 87c1be3..b6506e5 100644
--- a/test/integration/mysql_reader_test.rb
+++ b/test/integration/mysql_reader_test.rb
@@ -31,7 +31,7 @@ def test_tables_collection
     assert_equal 'numeric_types_basics', values[0].name
   end
   def test_paginated_read
-    expected_rows=3
+    expected_rows=5
     page_size=2
     expected_pages=(1.0 * expected_rows / page_size).ceil
     

From 4e6f1e500e2699bc075aa45c03b8a2b965e7746a Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sun, 21 Nov 2010 04:15:58 +0800
Subject: [PATCH 15/25] simplify tinyint type matching

---
 lib/mysql2psql/mysql_reader.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
index 0c4a182..5333845 100644
--- a/lib/mysql2psql/mysql_reader.rb
+++ b/lib/mysql2psql/mysql_reader.rb
@@ -39,9 +39,7 @@ def convert_type(type)
           "smallint"
         when "tinyint(1)"
           "boolean"
-        when "tinyint(3) unsigned"
-          "tinyint"
-        when "tinyint(4)"
+        when /tinyint/
           "tinyint"
         when /int/
           "integer"
@@ -80,7 +78,7 @@ def load_columns
               :primary_key => field[3] == "PRI",
               :auto_increment => field[5] == "auto_increment"
               }
-            desc[:default] = field[4] unless field[4].nil?            
+            desc[:default] = field[4] unless field[4].nil?
             fields << desc
           end
         end

From 2b7664a747bb00b24331655ace1624c9faa703c9 Mon Sep 17 00:00:00 2001
From: Andy Koch <andy.koch@pc-doctor.com>
Date: Fri, 8 Apr 2011 17:06:12 -0700
Subject: [PATCH 16/25] testing this with pg 0.10.+

---
 mysql2psql.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql2psql.gemspec b/mysql2psql.gemspec
index fb52551..530208f 100644
--- a/mysql2psql.gemspec
+++ b/mysql2psql.gemspec
@@ -75,16 +75,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mysql>, ["= 2.8.1"])
-      s.add_runtime_dependency(%q<pg>, ["= 0.9.0"])
+      s.add_runtime_dependency(%q<pg>, ["~> 0.10.0"])
       s.add_development_dependency(%q<test-unit>, [">= 2.1.1"])
     else
       s.add_dependency(%q<mysql>, ["= 2.8.1"])
-      s.add_dependency(%q<pg>, ["= 0.9.0"])
+      s.add_dependency(%q<pg>, ["~> 0.10.0"])
       s.add_dependency(%q<test-unit>, [">= 2.1.1"])
     end
   else
     s.add_dependency(%q<mysql>, ["= 2.8.1"])
-    s.add_dependency(%q<pg>, ["= 0.9.0"])
+    s.add_dependency(%q<pg>, ["~> 0.10.0"])
     s.add_dependency(%q<test-unit>, [">= 2.1.1"])
   end
 end

From a1d175598c7e576d257b4abbcc1c75f78852a5fc Mon Sep 17 00:00:00 2001
From: Andy Koch <andy.koch@pc-doctor.com>
Date: Fri, 8 Apr 2011 17:14:37 -0700
Subject: [PATCH 17/25] remove deprecated feature per gem -v 1.7.2

---
 mysql2psql.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mysql2psql.gemspec b/mysql2psql.gemspec
index 530208f..42f2ff4 100644
--- a/mysql2psql.gemspec
+++ b/mysql2psql.gemspec
@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Lapshin <max@maxidoors.ru>", "Anton Ageev <anton@ageev.name>", "Samuel Tribehou <cracoucax@gmail.com>", "Marco Nenciarini <marco.nenciarini@devise.it>", "James Nobis <jnobis@jnobis.controldocs.com>", "quel <github@quelrod.net>", "Holger Amann <keeney@fehu.org>", "Maxim Dobriakov <closer.main@gmail.com>", "Michael Kimsal <mgkimsal@gmail.com>", "Jacob Coby <jcoby@portallabs.com>", "Neszt Tibor <neszt@tvnetwork.hu>", "Miroslav Kratochvil <exa.exa@gmail.com>", "Paul Gallagher <gallagher.paul@gmail.com>"]
   s.date = %q{2010-09-19}
-  s.default_executable = %q{mysql2psql}
   s.description = %q{It can create postgresql dump from mysql database or directly load data from mysql to
     postgresql (at about 100 000 records per minute). Translates most data types and indexes.}
   s.email = %q{gallagher.paul@gmail.com}

From cada55b2aa2eab523d31464aebd3b7017e74944d Mon Sep 17 00:00:00 2001
From: Andy Koch <andy.koch@pc-doctor.com>
Date: Mon, 11 Apr 2011 11:05:50 -0700
Subject: [PATCH 18/25] add a check for mysql cmd, on my mac it's mysql5

---
 test/lib/test_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lib/test_helper.rb b/test/lib/test_helper.rb
index ea49633..4b77519 100644
--- a/test/lib/test_helper.rb
+++ b/test/lib/test_helper.rb
@@ -12,7 +12,8 @@
 def seed_test_database
   options=get_test_config_by_label(:localmysql_to_file_convert_nothing)
   seedfilepath = "#{File.dirname(__FILE__)}/../fixtures/seed_integration_tests.sql"
-  rc=system("mysql -u#{options.mysqlusername} #{options.mysqldatabase} < #{seedfilepath}")
+  mysql_cmd = `which mysql`.empty? ? 'mysql5' : 'mysql'
+  rc=system("#{mysql_cmd} -u#{options.mysqlusername} #{options.mysqldatabase} < #{seedfilepath}")
   raise StandardError unless rc
   return true
 rescue

From 12f0b435509ca67292b15326487809643690caca Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sat, 30 Apr 2011 20:49:54 +0800
Subject: [PATCH 19/25] resync gemspec and rakefile

---
 Rakefile           |  2 +-
 mysql2psql.gemspec | 87 ++++++++++++++++++++++------------------------
 2 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/Rakefile b/Rakefile
index c7193f3..933ba46 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,7 +30,7 @@ begin
       "Paul Gallagher <gallagher.paul@gmail.com>"
       ]
     gem.add_dependency "mysql", "= 2.8.1"
-    gem.add_dependency "pg", "= 0.9.0"
+    gem.add_dependency "pg", "~> 0.10.0"
     gem.add_development_dependency "test-unit", ">= 2.1.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
diff --git a/mysql2psql.gemspec b/mysql2psql.gemspec
index 42f2ff4..1b3baa1 100644
--- a/mysql2psql.gemspec
+++ b/mysql2psql.gemspec
@@ -1,6 +1,6 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Lapshin <max@maxidoors.ru>", "Anton Ageev <anton@ageev.name>", "Samuel Tribehou <cracoucax@gmail.com>", "Marco Nenciarini <marco.nenciarini@devise.it>", "James Nobis <jnobis@jnobis.controldocs.com>", "quel <github@quelrod.net>", "Holger Amann <keeney@fehu.org>", "Maxim Dobriakov <closer.main@gmail.com>", "Michael Kimsal <mgkimsal@gmail.com>", "Jacob Coby <jcoby@portallabs.com>", "Neszt Tibor <neszt@tvnetwork.hu>", "Miroslav Kratochvil <exa.exa@gmail.com>", "Paul Gallagher <gallagher.paul@gmail.com>"]
-  s.date = %q{2010-09-19}
+  s.date = %q{2011-04-30}
   s.description = %q{It can create postgresql dump from mysql database or directly load data from mysql to
     postgresql (at about 100 000 records per minute). Translates most data types and indexes.}
   s.email = %q{gallagher.paul@gmail.com}
@@ -18,58 +18,55 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "bin/mysql2psql",
-     "lib/mysql2psql.rb",
-     "lib/mysql2psql/config.rb",
-     "lib/mysql2psql/config_base.rb",
-     "lib/mysql2psql/converter.rb",
-     "lib/mysql2psql/errors.rb",
-     "lib/mysql2psql/mysql_reader.rb",
-     "lib/mysql2psql/postgres_db_writer.rb",
-     "lib/mysql2psql/postgres_file_writer.rb",
-     "lib/mysql2psql/postgres_writer.rb",
-     "lib/mysql2psql/version.rb",
-     "lib/mysql2psql/writer.rb",
-     "mysql2psql.gemspec",
-     "test/fixtures/config_all_options.yml",
-     "test/fixtures/seed_integration_tests.sql",
-     "test/integration/convert_to_db_test.rb",
-     "test/integration/convert_to_file_test.rb",
-     "test/integration/converter_test.rb",
-     "test/integration/mysql_reader_base_test.rb",
-     "test/integration/mysql_reader_test.rb",
-     "test/integration/postgres_db_writer_base_test.rb",
-     "test/lib/ext_test_unit.rb",
-     "test/lib/test_helper.rb",
-     "test/units/config_base_test.rb",
-     "test/units/config_test.rb",
-     "test/units/postgres_file_writer_test.rb"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "bin/mysql2psql",
+    "lib/mysql2psql.rb",
+    "lib/mysql2psql/config.rb",
+    "lib/mysql2psql/config_base.rb",
+    "lib/mysql2psql/converter.rb",
+    "lib/mysql2psql/errors.rb",
+    "lib/mysql2psql/mysql_reader.rb",
+    "lib/mysql2psql/postgres_db_writer.rb",
+    "lib/mysql2psql/postgres_file_writer.rb",
+    "lib/mysql2psql/postgres_writer.rb",
+    "lib/mysql2psql/version.rb",
+    "lib/mysql2psql/writer.rb",
+    "mysql2psql.gemspec",
+    "test/fixtures/config_all_options.yml",
+    "test/fixtures/seed_integration_tests.sql",
+    "test/integration/convert_to_db_test.rb",
+    "test/integration/convert_to_file_test.rb",
+    "test/integration/converter_test.rb",
+    "test/integration/mysql_reader_base_test.rb",
+    "test/integration/mysql_reader_test.rb",
+    "test/integration/postgres_db_writer_base_test.rb",
+    "test/lib/ext_test_unit.rb",
+    "test/lib/test_helper.rb",
+    "test/units/config_base_test.rb",
+    "test/units/config_test.rb",
+    "test/units/postgres_file_writer_test.rb"
   ]
   s.homepage = %q{http://github.com/tardate/mysql2postgresql}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Tool for converting mysql database to postgresql}
   s.test_files = [
     "test/integration/convert_to_db_test.rb",
-     "test/integration/convert_to_file_test.rb",
-     "test/integration/converter_test.rb",
-     "test/integration/mysql_reader_base_test.rb",
-     "test/integration/mysql_reader_test.rb",
-     "test/integration/postgres_db_writer_base_test.rb",
-     "test/lib/ext_test_unit.rb",
-     "test/lib/test_helper.rb",
-     "test/units/config_base_test.rb",
-     "test/units/config_test.rb",
-     "test/units/postgres_file_writer_test.rb"
+    "test/integration/convert_to_file_test.rb",
+    "test/integration/converter_test.rb",
+    "test/integration/mysql_reader_base_test.rb",
+    "test/integration/mysql_reader_test.rb",
+    "test/integration/postgres_db_writer_base_test.rb",
+    "test/lib/ext_test_unit.rb",
+    "test/lib/test_helper.rb",
+    "test/units/config_base_test.rb",
+    "test/units/config_test.rb",
+    "test/units/postgres_file_writer_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

From 2bae286677359254c73eebaa26b86888871dae8f Mon Sep 17 00:00:00 2001
From: Andy Koch <andy.koch@pc-doctor.com>
Date: Mon, 2 May 2011 10:27:10 -0700
Subject: [PATCH 20/25] update pg version to ~> 0.11.0 all tests passing

---
 mysql2psql.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql2psql.gemspec b/mysql2psql.gemspec
index 1b3baa1..035260d 100644
--- a/mysql2psql.gemspec
+++ b/mysql2psql.gemspec
@@ -71,16 +71,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mysql>, ["= 2.8.1"])
-      s.add_runtime_dependency(%q<pg>, ["~> 0.10.0"])
+      s.add_runtime_dependency(%q<pg>, ["~> 0.11.0"])
       s.add_development_dependency(%q<test-unit>, [">= 2.1.1"])
     else
       s.add_dependency(%q<mysql>, ["= 2.8.1"])
-      s.add_dependency(%q<pg>, ["~> 0.10.0"])
+      s.add_dependency(%q<pg>, ["~> 0.11.0"])
       s.add_dependency(%q<test-unit>, [">= 2.1.1"])
     end
   else
     s.add_dependency(%q<mysql>, ["= 2.8.1"])
-    s.add_dependency(%q<pg>, ["~> 0.10.0"])
+    s.add_dependency(%q<pg>, ["~> 0.11.0"])
     s.add_dependency(%q<test-unit>, [">= 2.1.1"])
   end
 end

From 3cce62510cb2cff8eb7fc41f43b1ebe76080dcaf Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Tue, 3 May 2011 06:13:18 +0800
Subject: [PATCH 21/25] resync rakefile + gemspec for pg ~> 0.11.0

---
 Rakefile           | 2 +-
 mysql2psql.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 933ba46..c774b1d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,7 +30,7 @@ begin
       "Paul Gallagher <gallagher.paul@gmail.com>"
       ]
     gem.add_dependency "mysql", "= 2.8.1"
-    gem.add_dependency "pg", "~> 0.10.0"
+    gem.add_dependency "pg", "~> 0.11.0"
     gem.add_development_dependency "test-unit", ">= 2.1.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
diff --git a/mysql2psql.gemspec b/mysql2psql.gemspec
index 035260d..f7f29b6 100644
--- a/mysql2psql.gemspec
+++ b/mysql2psql.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Lapshin <max@maxidoors.ru>", "Anton Ageev <anton@ageev.name>", "Samuel Tribehou <cracoucax@gmail.com>", "Marco Nenciarini <marco.nenciarini@devise.it>", "James Nobis <jnobis@jnobis.controldocs.com>", "quel <github@quelrod.net>", "Holger Amann <keeney@fehu.org>", "Maxim Dobriakov <closer.main@gmail.com>", "Michael Kimsal <mgkimsal@gmail.com>", "Jacob Coby <jcoby@portallabs.com>", "Neszt Tibor <neszt@tvnetwork.hu>", "Miroslav Kratochvil <exa.exa@gmail.com>", "Paul Gallagher <gallagher.paul@gmail.com>"]
-  s.date = %q{2011-04-30}
+  s.date = %q{2011-05-02}
   s.description = %q{It can create postgresql dump from mysql database or directly load data from mysql to
     postgresql (at about 100 000 records per minute). Translates most data types and indexes.}
   s.email = %q{gallagher.paul@gmail.com}

From a554cae0f51ce116274aa07a71f7164d39c2c6c2 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Tue, 3 May 2011 06:22:08 +0800
Subject: [PATCH 22/25] add CHANGELOG and step gem version to 0.1.1

---
 CHANGELOG                 | 11 +++++++++++
 lib/mysql2psql/version.rb |  2 +-
 mysql2psql.gemspec        |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..d969bba
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,11 @@
+0.1.1 May 3, 2011
+===
+
+* updated for pg driver ~> 0.11.0
+* add a check for mysql cmd, e.g. mysql or mysql5
+* remove deprecated feature per gem -v 1.7.2
+
+0.1.0 September 18, 2010
+===
+
+* Initial packaging as a gem
\ No newline at end of file
diff --git a/lib/mysql2psql/version.rb b/lib/mysql2psql/version.rb
index c61d5c1..b791a1a 100644
--- a/lib/mysql2psql/version.rb
+++ b/lib/mysql2psql/version.rb
@@ -2,7 +2,7 @@ class Mysql2psql
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
diff --git a/mysql2psql.gemspec b/mysql2psql.gemspec
index f7f29b6..8ad2931 100644
--- a/mysql2psql.gemspec
+++ b/mysql2psql.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mysql2psql}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Lapshin <max@maxidoors.ru>", "Anton Ageev <anton@ageev.name>", "Samuel Tribehou <cracoucax@gmail.com>", "Marco Nenciarini <marco.nenciarini@devise.it>", "James Nobis <jnobis@jnobis.controldocs.com>", "quel <github@quelrod.net>", "Holger Amann <keeney@fehu.org>", "Maxim Dobriakov <closer.main@gmail.com>", "Michael Kimsal <mgkimsal@gmail.com>", "Jacob Coby <jcoby@portallabs.com>", "Neszt Tibor <neszt@tvnetwork.hu>", "Miroslav Kratochvil <exa.exa@gmail.com>", "Paul Gallagher <gallagher.paul@gmail.com>"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    "CHANGELOG",
     "MIT-LICENSE",
     "README.rdoc",
     "Rakefile",

From dbef1077aab8c66ef6be76e54d7d4e5d1b834281 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Tue, 3 May 2011 06:39:42 +0800
Subject: [PATCH 23/25] Update README to reflect gem availability

---
 README.rdoc | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 7d3b476..0c2d493 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -12,9 +12,7 @@ Mysql2psql is packaged as a gem. Install as usual (use sudo if required).
 
   $ gem install mysql2psql
 
-NB: the gem hasn't been formally released on http://rubygems.org/ yet. For now you need to clone the git repo at http://github.com/tardate/mysql2postgres and 'rake install'.  
-
-After installation, the "mysql2psql" command will be available. 
+After installation, the "mysql2psql" command will be available.
 When run, it will generate a default configuration file in the current directory if a config
 file is not already found. The default configuration filename is mysql2psql.yml.
 
@@ -43,7 +41,7 @@ After editing the configuration file and launching tool, you will see something
 
 
 == Database driver dependencies
-Mysql2psql uses the 'mysql' and 'pg' gems for database connectivity. 
+Mysql2psql uses the 'mysql' and 'pg' gems for database connectivity.
 Mysql2psql gem installation should automatically install these too.
 
 If you encounter any issues with db connectivity, verify that the 'mysql' and 'pg' gems are installed and working correctly first.
@@ -53,15 +51,25 @@ The 'mysql' gem in particular may need a hint on where to find the mysql headers
   
 NB: With Ruby 1.8.x, the gem install will usually complain about "No definition for ..." errors. These are non-fatal and just affect the documentation install. This doesn't happen with Ruby 1.9.2.
 
+== Contributing to Mysql2psql
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so no-one unintentionally breaks it in a future version.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so the gem maintainers can cherry-pick around it.
+* Send a pull request
+
 == Getting the source
-Mysql2psql was first produced by Max Lapshin <max@maxidoors.ru> who maintains the master 
+Mysql2psql was first produced by Max Lapshin <max@maxidoors.ru> who maintains the master
 repository at http://github.com/maxlapshin/mysql2postgres
 
-The gem packaged version you are currently looking at has yet to be merged into the master repo.
 The gem bundling and refactoring for testing was done by Paul Gallagher <gallagher.paul@gmail.com> and
 the repository is at http://github.com/tardate/mysql2postgres
 
-Gem packaging is done with Jeweler. Note that on windows this means you must run under mingw or other shell that supports git to do the gem bundling (but you can gem install the built gem in the normal Windows shell). 
+Gem packaging is done with Jeweler. Note that on windows this means you must run under mingw or other shell that supports git to do the gem bundling (but you can gem install the built gem in the normal Windows shell).
 
 == Running tests
 If you fork/clone the project, you will want to run the test suite (and add to it if you are developing new features or fixing bugs).
@@ -69,18 +77,18 @@ If you fork/clone the project, you will want to run the test suite (and add to i
 A suite of tests are provided and are run using rake (rake -T for more info)
   rake test:units
   rake test:integration
-  rake test 
+  rake test
 
 Rake without parameters (or "rake test") will run both the unit and integration tests.
 
 Unit tests are small standalone tests of the mysql2psql codebase that have no external dependencies (like a database)
 
-Integration tests require suitable mysql and postgres databases to be setup in advance. 
+Integration tests require suitable mysql and postgres databases to be setup in advance.
 Running the integration tests *will* rewrite data and schema for the "mysql2psql_test" databases in mysql and postgres. Don't use this database for anything else!
 
-mysql on localhost:3306
-- database created called "mysql2psql_test"
-- user setup for "mysql2psql" with no password
+Setting up mysql on localhost:3306
+- create a database called "mysql2psql_test"
+- setup a user "mysql2psql" with no password
 
 e.g.
 
@@ -90,9 +98,9 @@ e.g.
   mysql -umysql2psql -e "select database(),'yes' as connected" mysql2psql_test
 
 
-postgres on localhost:5432
-- database created called "mysql2psql_test" 
-- role (user) access setup for "mysql2psql" with no password
+Setting up PostgreSQL on localhost:5432
+- create a database called "mysql2psql_test"
+- setup a role (user) "mysql2psql" with no password
 
 e.g.
 
@@ -106,7 +114,6 @@ e.g.
 
 === Todo
 - more tests
-- release gem
 
 === note from mgkimsal
 I'm still having trouble with bit(1)/boolean fields
@@ -136,7 +143,3 @@ Other contributors (in git log order):
 - Neszt Tibor <neszt@tvnetwork.hu>
 - Miroslav Kratochvil <exa.exa@gmail.com>
 - Paul Gallagher <gallagher.paul@gmail.com>
-
-
- 
-

From fdc6ea1c8b13be59216d9be73334c5d386774b48 Mon Sep 17 00:00:00 2001
From: Simon Yun <simon@bifflabs.com>
Date: Thu, 26 May 2011 11:38:11 -0400
Subject: [PATCH 24/25] Output geometry columns as WKT.

---
 lib/mysql2psql/mysql_reader.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/mysql2psql/mysql_reader.rb b/lib/mysql2psql/mysql_reader.rb
index 5333845..df1e834 100644
--- a/lib/mysql2psql/mysql_reader.rb
+++ b/lib/mysql2psql/mysql_reader.rb
@@ -150,7 +150,14 @@ def count_for_pager
  
       def query_for_pager
         query = has_id? ? 'WHERE id >= ? AND id < ?' : 'LIMIT ?,?'
-        "SELECT #{columns.map{|c| "`"+c[:name]+"`"}.join(", ")} FROM `#{name}` #{query}"
+	cols = columns.map do |c|
+	  if "geometry" == c[:type]
+            "AsWKT(`#{c[:name]}`) as `#{c[:name]}`"
+          else
+            "`#{c[:name]}`"
+          end
+        end
+        "SELECT #{cols.join(", ")} FROM `#{name}` #{query}"
       end
     end
   

From ef679723d9723789aae9d3f9559811bf68c91a34 Mon Sep 17 00:00:00 2001
From: Simon Yun <simon@bifflabs.com>
Date: Thu, 26 May 2011 11:39:32 -0400
Subject: [PATCH 25/25] Output geometry columns from MySQL.

---
 lib/mysql2psql/postgres_writer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/mysql2psql/postgres_writer.rb b/lib/mysql2psql/postgres_writer.rb
index 847478f..56988c6 100644
--- a/lib/mysql2psql/postgres_writer.rb
+++ b/lib/mysql2psql/postgres_writer.rb
@@ -92,6 +92,8 @@ def column_type_info(column)
         "text"
       when "text"
         "text"
+      when "geometry"
+        "geometry"
       when /^enum/
         default = default + "::character varying" if default
         enum = column[:type].gsub(/enum|\(|\)/, '')