connectator 0.0.4 → 0.0.5

data/README.md

@@ -1,9 +1,8 @@
-connectator
-===========
-
+# Connectator [![Build Status](https://travis-ci.org/jamin4jc/connectator.png?branch=master)](https://travis-ci.org/jamin4jc/connectator)
+ 
 Multi-Connection proxy for DBI
 
-== Notes
+## Notes
 
 *This gem is currently using the older DBI gem.*
 https://github.com/erikh/ruby-dbi
@@ -11,33 +10,34 @@ https://github.com/erikh/ruby-dbi
 This will at some point in the future change to use the new rdbi gem.
 https://github.com/RDBI/rdbi
 
-=== Oracle
+### Oracle
 
 * Uses the ruby-oci8 gem directly
 * Note that this gem does not directly require the ruby-oci8 gem.  If you need
 to use Oracle, include the ruby-oci8 gem in your project.
 
-=== Sql Server/Sybase
+### Sql Server/Sybase
 
 * Uses DBI:ODBC
 * In order to use SQL Server/Sybase with Connectator, you will need to set up
 Unix ODBC and FreeTDS.  Unix ODBC will need to reference FreeTDS as one of its
 drivers.
 
-=== MySQL
+### MySQL
 
 * Uses DBI:ODBC
 * In order to use MySQL with Connectator, you will need to set up Unix ODBC and
 the MySQL client. Unix ODBC will need to reference the MySQL driver as one of
 its drivers.
+* On Ubuntu, use package: libmyodbc
 
-=== DB2
+### DB2
 
 * Uses DBI:DB2
 * In order to use DB2 with Connectator, you will need to set up Unix ODBC and
 the DB2 client. Unix ODBC will need to reference the DB2 driver as one of its
 drivers.
 
-== UNIX ODBC
+## UNIX ODBC
 
 See example_odbcinst.ini for a sample of what the /etc/odbcinst.ini should look like.

data/example_odbcinst.ini

@@ -8,8 +8,8 @@ FileUsage       = 1
 
 [MySQL]
 Description     = MySQL
-Driver          = /usr/lib64/libmyodbc5.so
-Setup           = /usr/lib64/libodbcmyS.so
+Driver          = /usr/lib/odbc/libmyodbc.so
+Setup           = /usr/lib/libodbcmyS.so
 FileUsage       = 1
 
 [DB2]

data/lib/connectator/base/connection.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module Connectator
   module Base
     class Connection
@@ -20,7 +18,7 @@ module Connectator
       end
 
       def system_connection
-        @system_connection ||= DBIProxy.new(open)
+        @system_connection ||= Connectator::Base::DBIProxy.new(open)
       end
       
       # proxies all other method calls to the DBIProxy
@@ -60,7 +58,7 @@ module Connectator
       end
 
       def connection_params_list
-        connection_params_hash.map { |k,v| "#{k}=#{v}"}.join(';')
+        connection_params_hash.reject {|k,v| v.nil? }.map { |k,v| "#{k}=#{v}"}.join(';')
       end
       
       def connection_params_hash

data/lib/connectator/mysql/connection.rb

@@ -4,9 +4,10 @@ module Connectator
 
       def initialize(opts = {})
         connection_params.driver   = 'MySQL'
+        # See this url for options flags
+        # http://dev.mysql.com/doc/refman/5.0/en/connector-odbc-configuration-connection-parameters.html#codbc-dsn-option-flags
         connection_params.option   = opts[:option]   || '3'
-        connection_params.port     = opts[:port]     || '3306'
-        connection_params.database = opts[:database] || ''
+        connection_params.database = opts[:database] || nil
         super(opts)
       end
       
@@ -19,12 +20,12 @@ module Connectator
       def connection_params_hash
         {
          "DRIVER"      => connection_params.driver,
-         "Server"      => connection_params.server,
-         "Port"        => connection_params.port,
-         "Database"    => connection_params.database,
-         "User"        => connection_params.username,
-         "Password"    => connection_params.password,
-         "Option"      => connection_params.option
+         "SERVER"      => connection_params.server,
+         "PORT"        => connection_params.port,
+         "DATABASE"    => connection_params.database,
+         "UID"         => connection_params.username,
+         "PWD"         => connection_params.password,
+         "OPTION"      => connection_params.option
         }
       end
     end

data/lib/connectator/pinger.rb

@@ -1,5 +1,3 @@
-require 'timeout'
-
 module Connectator
   module Pinger
     def self.ping?(host, timeout = 1)

data/lib/connectator.rb

@@ -1,9 +1,14 @@
-require 'connectator/base/connection'
-require 'connectator/db2/connection'
-require 'connectator/mysql/connection'
-require 'connectator/oracle/connection'
-require 'connectator/sql/connection'
-require 'connectator/sql/connection/server_instance_string'
-require 'connectator/sybase/connection'
-require 'connectator/factory'
-require 'connectator/pinger'
+require 'dbi'
+require 'timeout'
+require 'ostruct'
+
+require_relative 'connectator/base/connection'
+require_relative 'connectator/base/dbi_proxy'
+require_relative 'connectator/db2/connection'
+require_relative 'connectator/mysql/connection'
+require_relative 'connectator/oracle/connection'
+require_relative 'connectator/sql/connection'
+require_relative 'connectator/sql/connection/server_instance_string'
+require_relative 'connectator/sybase/connection'
+require_relative 'connectator/factory'
+require_relative 'connectator/pinger'

data/spec/connectator/mysql/connection_spec.rb

@@ -20,21 +20,21 @@ describe Connectator::Mysql::Connection do
     Then { connection.connection_params.username.should     == 'User'     }
     Then { connection.connection_params.password.should     == 'Pass'     }
     Then { connection.connection_params.instance.should     == 'Instance' }
-    Then { connection.connection_params.database.should     == ''         }
+    Then { connection.connection_params.database.should     == nil        }
     Then { connection.connection_params.option.should       == '3'        }
 
     Then { connection.connection_string.should ==
-          "DBI:ODBC:DRIVER=MySQL;Server=Server;Port=Port;Database=;User=User;Password=Pass;Option=3"  }
+          "DBI:ODBC:DRIVER=MySQL;SERVER=Server;PORT=Port;UID=User;PWD=Pass;OPTION=3"  }
 
     Then { connection.send(:connection_params_hash).should == 
       {
        "DRIVER"      => 'MySQL',
-       "Server"      => 'Server',
-       "Port"        => 'Port',
-       "Database"    => '',
-       "User"        => 'User',
-       "Password"    => 'Pass',
-       "Option"      => '3'
+       "SERVER"      => 'Server',
+       "PORT"        => 'Port',
+       "DATABASE"    => nil,
+       "UID"         => 'User',
+       "PWD"         => 'Pass',
+       "OPTION"      => '3'
       }
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connectator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4345797816152053971
+      hash: -707223795178079430
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: