Ticket #8400: sybase_patch.txt

Index: sybase_adapter.rb
===================================================================
--- sybase_adapter.rb   (revision 6768)
+++ sybase_adapter.rb   (working copy)
@@ -42,9 +42,8 @@
         raise ArgumentError, "No database specified. Missing argument: database."
       end
 
-      ConnectionAdapters::SybaseAdapter.new(
-        SybSQL.new({'S' => host, 'U' => username, 'P' => password},
-          ConnectionAdapters::SybaseAdapterContext), database, config, logger)
+      ConnectionAdapters::SybaseAdapter.new(host, username, password,
+                           database, config, logger)
     end
   end # class Base
 
@@ -116,14 +115,28 @@
       end # class ColumnWithIdentity
 
       # Sybase adapter
-      def initialize(connection, database, config = {}, logger = nil)
-        super(connection, logger)
-        context = connection.context
-        context.init(logger)
+      def initialize(host, username, password,
+                    database, config = {}, logger = nil)
+        super(nil, logger)
+        @host = host
+        @username = username
+        @password = password
         @config = config
+        @database = database 
         @numconvert = config.has_key?(:numconvert) ? config[:numconvert] : true
         @limit = @offset = 0
-        unless connection.sql_norow("USE #{database}")
+        connect
+      end
+
+      def connect
+        @connection = SybSQL.new({'S' => @host, 'U' => @username,
+                'P' => @password},
+          ConnectionAdapters::SybaseAdapterContext)
+        @runtime = 0
+        @last_verification = 0
+        context = @connection.context
+        context.init(@logger)
+        unless @connection.sql_norow("USE #{@database}")
           raise "Cannot USE #{database}"
         end
       end
@@ -167,9 +180,8 @@
       end
 
       def reconnect!
-        raise "Sybase Connection Adapter does not yet support reconnect!"
-        # disconnect!
-        # connect! # Not yet implemented
+        disconnect!
+        connect
       end
 
       def table_alias_length