Merge remote branch 'seven1m/master' into master

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.rdoc
	lib/mysql2psql/mysql_reader.rb
	lib/mysql2psql/postgres_writer.rb

Author: tardate

Diff for: Gemfile

@@ -1,8 +1,8 @@
-source 'http://rubygems.org'
+source :rubygems
 
 group :development do
   gem "bundler", "~> 1.0.21"
   gem "jeweler", "~> 1.5.2"
 end
 
-gemspec
+gemspec

Diff for: Gemfile.lock

@@ -2,8 +2,6 @@ PATH
   remote: .
   specs:
     mysql2psql (0.2.0)
-      bundler (~> 1.0.21)
-      jeweler (~> 1.5.2)
       mysql (= 2.8.1)
       mysql2psql
       pg (~> 0.11.0)

Diff for: README.rdoc

@@ -61,7 +61,7 @@ NB: With Ruby 1.8.x, the gem install will usually complain about "No definition
 * 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 <[email protected]> who maintains the master
 repository at https://github.com/maxlapshin/mysql2postgres
@@ -71,6 +71,15 @@ the repository is at https://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).
 
+== Setting up for development
+
+The project includes a Gemfile so with bundler you can install gem dependencies with:
+
+  gem install bundler # if not already installed
+  bundle install
+
+Note comments 'Database driver dependencies' regarding issues that you may encounter with the mysql gem.
+  
 == 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).
 
@@ -135,3 +144,4 @@ Contributors (roughly git log order):
 - {James Coleman}[https://github.com/jcoleman] <[email protected]>
 - {Aaron Peckham}[https://github.com/apeckham]
 - {James Tippett}[https://github.com/jtippett]
+- {Tim Morgan}[https://github.com/seven1m]

Diff for: Rakefile

@@ -30,7 +30,8 @@ begin
       "Paul Gallagher <[email protected]>",
       "James Coleman <[email protected]>",
       "Aaron Peckham",
-      "James Tippett"
+      "James Tippett",
+      "Tim Morgan"
     ]
     gem.add_dependency "mysql", "= 2.8.1"
     gem.add_dependency "pg", "~> 0.11.0"

Diff for: lib/mysql2psql/converter.rb

@@ -54,6 +54,7 @@ def convert
       return 0
     rescue => e
       $stderr.puts "Mysql2psql: conversion failed: #{e.to_s}"
+      $stderr.puts e.backtrace
       return -1
     end
   end

Diff for: lib/mysql2psql/mysql_reader.rb

@@ -1,4 +1,5 @@
 require 'mysql'
+require 'csv'
 
 class Mysql2psql
 
@@ -46,7 +47,7 @@ def convert_type(type)
         when /varchar/
           "varchar"
         when /char/
-          "char"          
+          "char"
         when /decimal/
           "decimal"
         when /float/
@@ -55,7 +56,7 @@ def convert_type(type)
           "double precision"
         else
           type
-        end 
+        end
       end
 
       def load_columns
@@ -94,7 +95,7 @@ def load_columns
 
       def indexes
         load_indexes unless @indexes
-        @indexes 
+        @indexes
       end
 
       def foreign_keys
@@ -111,11 +112,26 @@ def load_indexes
           explain.split(/\n/).each do |line|
             next unless line =~ / KEY /
             index = {}
-            if match_data = /CONSTRAINT `(\w+)` FOREIGN KEY \(`(\w+)`\) REFERENCES `(\w+)` \(`(\w+)`\)/.match(line)
+            if match_data = /CONSTRAINT `(\w+)` FOREIGN KEY \((.*?)\) REFERENCES `(\w+)` \((.*?)\)(.*)/.match(line)
               index[:name] = match_data[1]
-              index[:column] = match_data[2]
+              index[:column] = match_data[2].parse_csv(:quote_char => '`',:col_sep => ', ')
               index[:ref_table] = match_data[3]
-              index[:ref_column] = match_data[4]
+              index[:ref_column] = match_data[4].parse_csv(:quote_char => '`',:col_sep => ', ')
+              
+              the_rest = match_data[5]
+
+              if match_data = /ON DELETE (SET NULL|SET DEFAULT|RESTRICT|NO ACTION|CASCADE)/.match(the_rest)
+                index[:on_delete] = match_data[1]
+              else
+                index[:on_delete] ||= 'RESTRICT'
+              end
+
+              if match_data = /ON UPDATE (SET NULL|SET DEFAULT|RESTRICT|NO ACTION|CASCADE)/.match(the_rest)
+                index[:on_update] = match_data[1]
+              else
+                index[:on_update] ||= 'RESTRICT'
+              end
+              
               @foreign_keys << index
             elsif match_data = /KEY `(\w+)` \((.*)\)/.match(line)
               index[:name] = match_data[1]
@@ -138,7 +154,7 @@ def count_rows
       end
 
       def has_id?
-        !!columns.find {|col| col[:name] == "id"} 
+        !!columns.find {|col| col[:name] == "id"}
       end
 
       def count_for_pager
@@ -166,10 +182,13 @@ def reconnect
     end
 
     def initialize(options)
-      @host, @user, @passwd, @db, @port, @sock, @flag = 
-        options.mysqlhostname('localhost'), options.mysqlusername, 
-        options.mysqlpassword, options.mysqldatabase, 
-        options.mysqlport, options.mysqlsocket(nil)
+      @host, @user, @passwd, @db, @port, @sock, @flag =
+        options.mysqlhostname('localhost'), options.mysqlusername,
+        options.mysqlpassword, options.mysqldatabase,
+        options.mysqlport, options.mysqlsocket
+      @port = nil if @port == ""  # for things like Amazon's RDS you don't have a port and connect fails with "" for a value
+      @sock = nil if @sock == ""
+      @flag = nil if @flag == ""
       connect
     end
 

Diff for: lib/mysql2psql/postgres_db_writer.rb

@@ -116,7 +116,7 @@ def write_indexes(table)
 
   def write_constraints(table)
     table.foreign_keys.each do |key|
-      key_sql = "ALTER TABLE #{PGconn.quote_ident(table.name)} ADD FOREIGN KEY (#{PGconn.quote_ident(key[:column])}) REFERENCES #{PGconn.quote_ident(key[:ref_table])}(#{PGconn.quote_ident(key[:ref_column])})"
+      key_sql = "ALTER TABLE #{PGconn.quote_ident(table.name)} ADD FOREIGN KEY (#{key[:column].map{|c|PGconn.quote_ident(c)}.join(', ')}) REFERENCES #{PGconn.quote_ident(key[:ref_table])}(#{key[:ref_column].map{|c|PGconn.quote_ident(c)}.join(', ')}) ON UPDATE #{key[:on_update]} ON DELETE #{key[:on_delete]}"
       begin
         @conn.exec(key_sql)
       rescue Exception => e

Diff for: lib/mysql2psql/postgres_file_writer.rb

@@ -122,7 +122,7 @@ def write_indexes(table)
 
   def write_constraints(table)
     table.foreign_keys.each do |key|
-      @f << "ALTER TABLE #{PGconn.quote_ident(table.name)} ADD FOREIGN KEY (#{PGconn.quote_ident(key[:column])}) REFERENCES #{PGconn.quote_ident(key[:ref_table])}(#{PGconn.quote_ident(key[:ref_column])});\n"
+      @f << "ALTER TABLE #{PGconn.quote_ident(table.name)} ADD FOREIGN KEY (#{key[:column].map{|c|PGconn.quote_ident(c)}.join(', ')}) REFERENCES #{PGconn.quote_ident(key[:ref_table])}(#{key[:ref_column].map{|c|PGconn.quote_ident(c)}.join(', ')}) ON UPDATE #{key[:on_update]} ON DELETE #{key[:on_delete]};\n"
     end
   end
 

Diff for: lib/mysql2psql/postgres_writer.rb

@@ -23,7 +23,8 @@ def column_type(column, options={})
         when 'real', /float/, 'double precision'
           'double precision'
         when 'decimal'
-          "numeric(#{column[:length] || 10}, #{column[:decimals] || 0})"
+          # TODO: seven1m thinks "real" instead?
+          "numeric(#{column[:length] || 10}, #{column[:decimals] || 5})"
         when 'datetime', 'timestamp'
           "timestamp with#{options[:use_timezones] ? '' : 'out'} time zone"
         when 'time'
@@ -107,7 +108,11 @@ def column_type_info(column, options)
     def process_row(table, row)
       table.columns.each_with_index do |column, index|
         if column[:type] == 'time'
-          row[index] = "%02d:%02d:%02d" % [row[index].hour, row[index].minute, row[index].second]
+          begin
+            row[index] = "%02d:%02d:%02d" % [row[index].hour, row[index].minute, row[index].second]
+          rescue
+            # Don't fail on nil date/time.
+          end
         elsif row[index].is_a?(Mysql::Time)
           row[index] = row[index].to_s.gsub('0000-00-00 00:00', '1970-01-01 00:00')
           row[index] = row[index].to_s.gsub('0000-00-00 00:00:00', '1970-01-01 00:00:00')
@@ -142,7 +147,7 @@ def process_row(table, row)
         elsif row[index].nil?
           # Note: '\N' not "\N" is correct here:
           #       The string containing the literal backslash followed by 'N'
-          #       represents database NULL value in PostgreSQL's text mode. 
+          #       represents database NULL value in PostgreSQL's text mode.
           row[index] = '\N'
         end
       end

Diff for: test/integration/convert_to_db_test.rb

@@ -112,7 +112,7 @@ def test_index_conversion
 
   def test_foreign_keys
     result = exec_sql_on_psql("SELECT conname, pg_catalog.pg_get_constraintdef(r.oid, true) as condef FROM pg_catalog.pg_constraint r WHERE r.conrelid = 'test_foreign_keys_child'::regclass")
-    expected = {"condef" => "FOREIGN KEY (test_foreign_keys_parent_id) REFERENCES test_foreign_keys_parent(id)", "conname" => "test_foreign_keys_child_test_foreign_keys_parent_id_fkey"}
+    expected = {"condef" => "FOREIGN KEY (test_foreign_keys_parent_id) REFERENCES test_foreign_keys_parent(id) ON UPDATE RESTRICT ON DELETE CASCADE", "conname" => "test_foreign_keys_child_test_foreign_keys_parent_id_fkey"}
     assert_equal expected, result.first
   end
 

Diff for: test/integration/mysql_reader_base_test.rb

@@ -24,4 +24,11 @@ def test_mysql_reconnect
       reader.reconnect
     end
   end
+  def test_mysql_connection_without_port
+    assert_nothing_raised do
+      @options.mysqlport = ""
+      @options.mysqlsocket = ""
+      reader = Mysql2psql::MysqlReader.new(@options)
+    end
+  end
 end