From dcd618cbe96896b8d1bbfba797244fed35950494 Mon Sep 17 00:00:00 2001
From: Max Lapshin <max@maxidoors.ru>
Date: Mon, 1 Mar 2010 18:03:31 +0300
Subject: [PATCH] Fixed config. Changed from gem postgres to gem pg

---
 config.yml.sample | 12 ++++++++----
 mysql2psql        | 27 +++++++++++----------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/config.yml.sample b/config.yml.sample
index 0dd4703..a4209b9 100644
--- a/config.yml.sample
+++ b/config.yml.sample
@@ -17,7 +17,11 @@ destination:
   databasename: somename
 
 tables:
- table1,
- table2,
- #table3,
- table4
+- table1
+- table2
+#- table3
+- table4
+
+exclude_tables:
+- table5
+- table6
diff --git a/mysql2psql b/mysql2psql
index faef45c..7620280 100755
--- a/mysql2psql
+++ b/mysql2psql
@@ -2,8 +2,8 @@
 
 require 'rubygems'
 require 'mysql'
-gem "postgres"
-require 'postgres'
+gem "pg"
+require 'pg'
 require 'yaml'
 
 class MysqlReader
@@ -404,7 +404,7 @@ end
 class PostgresDbWriter < PostgresWriter
   def connection(hostname, login, password, database, port)
     database, schema = database.split(":")
-    @conn = PGconn.open('host' => hostname, 'user' => login, 'password' => password, 'dbname' => database, 'port' => port.to_s)
+    @conn = PGconn.open(hostname, port.to_s, '', '', database, login, password)
     @conn.exec("SET search_path TO #{PGconn.quote_ident(schema)}") if schema
   end
   
@@ -640,11 +640,6 @@ end
 
 
 
-
-def parse_tablenames(tables)
-  tables.map {|table| table.strip}.reject {|t| t =~ /^#/}
-end
-
 def read_config(filepath)
   config = YAML::load(File.read(filepath))
   @mysqluser = config["mysql"]["username"] ? config["mysql"]["username"] : ''
@@ -652,23 +647,20 @@ def read_config(filepath)
   @mysqlhost = config["mysql"]["hostname"] ? config["mysql"]["hostname"] : 'localhost'
   @mysqlport = config["mysql"]["port"]
   @mysqlsock = config["mysql"]["socket"]
-  @mysqldb = config["mysql"]["databasename"]
+  @mysqldb   = config["mysql"]["database"]
 
   @destfile = config["destination"]["file"]
   @pguser = config["destination"]["postgres"]["username"] ? config["destination"]["postgres"]["username"] : ''
   @pgpass = config["destination"]["postgres"]["password"] ? config["destination"]["postgres"]["password"] : ''
   @pghost = config["destination"]["postgres"]["hostname"] ? config["destination"]["postgres"]["hostname"] : 'localhost'
   @pgport = config["destination"]["postgres"]["port"] ? config["destination"]["postgres"]["port"].to_i : 5432
-  @pgdb = config["destination"]["postgres"]["databasename"] 
+  @pgdb   = config["destination"]["postgres"]["database"] 
 
-  @tables = config["tables"] ? config["tables"].split(',') : nil
+  @tables = config["tables"]
+  @exclude_tables = config["exclude_tables"]
 end
 
 read_config("config.yml")
-if @tables.nil?
-  puts "No tables given."
-  exit 1
-end
 
 reader = MysqlReader.new(@mysqlhost, @mysqluser, @mysqlpass, @mysqldb, @mysqlport, @mysqlsock)
 
@@ -678,5 +670,8 @@ else
   writer = PostgresFileWriter.new(@destfile)
 end
 
-converter = Converter.new(reader, writer, :only_tables => parse_tablenames(@tables))
+options = {}
+options[:only_tables] = @tables if @tables
+options[:exclude_tables] = @exclude_tables if @exclude_tables
+converter = Converter.new(reader, writer, options)
 converter.convert
-- 
2.1.4