dbd-jdbc 0.0.4 → 0.0.5

data/README.txt

@@ -1,33 +1,85 @@
 RECENT CHANGES
 ==============
-The dbd-jdbc project has recently moved to Kenai and can be found at the following url (http://kenai.com/projects/dbd-jdbc).  Please report any bugs found to the issue tracker listed on the Kenai project page.
+The dbd-jdbc project has recently moved to Kenai and can be found at the following url 
+(http://kenai.com/projects/dbd-jdbc).  Please report any bugs found to the issue 
+tracker listed on the Kenai project page.
 
 OVERVIEW
 ========
-The Jdbc driver for DBI runs only under JRuby, using JRuby's Java integration to act as a thin wrapper around JDBC Connections obtained through DriverManager.  Theoretically this driver can support any database that has JDBC support, although the behavior of certain aspects of the DBI API will differ slightly based on the implementation of the JDBC driver and the underlying database (see LIMITATIONS) 
+The Jdbc driver for DBI runs only under JRuby, using JRuby's Java integration to act 
+as a thin wrapper around JDBC Connections obtained through DriverManager.  
+Theoretically this driver can support any database that has JDBC support, although the 
+behavior of certain aspects of the DBI API will differ slightly based on the 
+implementation of the JDBC driver and the underlying database (see LIMITATIONS) 
 
 INSTALLATION
 ============
-Besides the ruby files being installed with DBI (in DBD/Jdbc), the JDBC driver classes must be added to the JRuby classpath.  One way to do this on UNIX machines is to place a JDBC driver jarfile in JRUBY_HOME/lib.  Another way is to set the CLASSPATH environment variable.  The jruby (or jruby.bat) script can also be modified to add to the classpath.  In the future there may be more dynamic ways to add jarfiles to the classpath as well; check with the JRuby documentation.
+Besides the ruby files being installed with DBI (in DBD/Jdbc), the JDBC driver classes 
+must be added to the JRuby classpath.  One way to do this on UNIX machines is to 
+place a JDBC driver jarfile in JRUBY_HOME/lib.  Another way is to set the CLASSPATH 
+environment variable.  The jruby (or jruby.bat) script can also be modified to add to 
+the classpath.  In the future there may be more dynamic ways to add jarfiles to the 
+classpath as well; check with the JRuby documentation.
 
 USAGE
 =====
-This driver is used like any standard DBI driver, by requiring 'dbi' and obtaining a connection through the DBI.connect method.  The DSN for the database should be "dbi:" followed by the standard Java database URL (jdbc:<subprotocol>:<subname>).  In addition, the attributes hash passed to the connect method must contain the key/value pair "driver" => <jdbc driver class name>.  For example (MySQL):
+This driver is used like any standard DBI driver, by requiring 'dbi' and obtaining a 
+connection through the DBI.connect method.  The DSN for the database should be "dbi:" 
+followed by the standard Java database URL (jdbc:<subprotocol>:<subname>).  In 
+addition, the attributes hash passed to the connect method must contain the key/value 
+pair "driver" => <jdbc driver class name>.  For example (MySQL):
 
-dbh = DBI.connect('dbi:jdbc:mysql://localhost:3306/test', 'anonymous', '', { "driver" => "com.mysql.jdbc.Driver" } )
+dbh = DBI.connect('dbi:jdbc:mysql://localhost:3306/test', 'anonymous', '', 
+        { "driver" => "com.mysql.jdbc.Driver" } )
 
 SUPPORTED ATTRIBUTES
 ====================
-Besides the mandatory "driver" attribute that must be passed in the DBI connect method, there are additional attributes that can be passed to modify the behavior of the driver.  In addition to setting these attributes during the connect call, they can be set on a driver handle using []= (e.g. dbh["autocommit"] = true).  The currently supported attributes are:
-1) autocommit:  sets the autoCommit status of the underlying JDBC Connection (there is a 1-1 relationship between a DBI Database instance and a JDBC Connection)
-2) nulltype: sets the java.sql.Types constant to use when binding nil to a Statement.  See LIMITATIONS
+Besides the mandatory "driver" attribute that must be passed in the DBI connect method, 
+there are additional attributes that can be passed to modify the behavior of the 
+driver.  In addition to setting these attributes during the connect call, they can be 
+set on a driver handle using []= (e.g. dbh["autocommit"] = true).  The currently 
+supported attributes are:
+
+1) autocommit:  sets the autoCommit status of the underlying JDBC Connection 
+   (there is a 1-1 relationship between a DBI Database instance and a JDBC Connection)
+2) nulltype: sets the java.sql.Types constant to use when binding nil to a Statement.  
+   See LIMITATIONS
 
 LIMITATIONS
 ===========
-There are limitations to the JDBC driver that are largely based on incompatibilities between the DBI and JDBC APIs, and the differences in underlying JDBC driver implementations.  
+There are limitations to the JDBC driver that are largely based on incompatibilities 
+between the DBI and JDBC APIs, and the differences in underlying JDBC driver 
+implementations.  
 
-1) Binding nil to statements is somewhat unreliable due to the fact that JDBC requires type information in PreparedStatement.setNull(int), but there is no type information associated with nil in ruby.  E.g., statements like DBI.select_all("select * from a, b, c where col1=? and col2=?", "a", nil) might run into problems.  One workaround is to hardcode NULL in the sql statement.  If executing multiple inserts and some values might be nil, the driver will call setNull with the type specified in the driver attribute "nulltype".  If the default fails with a given driver, try specifying different nulltypes such as "dbh['nulltype'] = java.sql.Types::NULL" or "dbh['nulltype'] = java.sql.Types::OTHER" to see if it will work.
+1) Binding nil to statements is somewhat unreliable due to the fact that JDBC requires 
+type information in PreparedStatement.setNull(int), but there is no type information 
+associated with nil in ruby.  E.g., statements like DBI.select_all("select * from a, b, 
+c where col1=? and col2=?", "a", nil) might run into problems.  One workaround is to 
+hardcode NULL in the sql statement.  If executing multiple inserts and some values 
+might be nil, the driver will call setNull with the type specified in the driver 
+attribute "nulltype".  If the default fails with a given driver, try specifying 
+different nulltypes such as "dbh['nulltype'] = java.sql.Types::NULL" or 
+"dbh['nulltype'] = java.sql.Types::OTHER" to see if it will work.
 
-2) Type conversion in result sets: Java to Ruby type conversion in results of queries is more limited than in JDBC, since DBI returns an entire row at a time, without type information specified (unlike JDBC ResultSet where getInt, getString, etc allow each column to be typed appropriately).  The driver attempts to convert each data type, relying mostly on getObject() and the JRuby type conversion system.  Due to the fact that JDBC drivers are not constrained to the exact Java types returned for each SQL type, it is possible for some conversion oddities to arise (e.g. returning Java BigDecimal which isn't converted by JRuby, leading to a Java BigDecimal rather than Ruby Fixnum/BigDecimal).
+2) Type conversion in result sets: Java to Ruby type conversion in results of queries 
+is more limited than in JDBC, since DBI returns an entire row at a time, without type 
+information specified (unlike JDBC ResultSet where getInt, getString, etc allow each 
+column to be typed appropriately).  The driver attempts to convert each data type, 
+relying mostly on getObject() and the JRuby type conversion system.  Due to the fact 
+that JDBC drivers are not constrained to the exact Java types returned for each SQL 
+type, it is possible for some conversion oddities to arise (e.g. returning Java 
+BigDecimal which isn't converted by JRuby, leading to a Java BigDecimal rather than 
+Ruby Fixnum/BigDecimal).
 
-3) Type conversion in prepared statements: In addition to not being able to use type data when returning data, it isn't possible to specify type data directly when binding parameters either (when binding multiple parameters, DBI has ability to set type data, and when calling bind_param, this driver does not currently support type data in the attributes).  Most conversions should work without problem, but there is ambiguity in the Ruby Float type since it can be treated as float or double (or BigDecimal) in Java (and FLOAT, DOUBLE, REAL, NUMERIC, DECIMAL, etc in java.sql.Types).  setDouble() is used to try to retain the highest precision, but some problems have been seen (e.g. Sybase REAL works better with setFloat()).  When doing inserts or retrieval, be sure that the driver keeps the desired precision (the only workaround is to change the database column type to something that works better for doubles with the given JDBC driver and database)
+3) Type conversion in prepared statements: In addition to not being able to use type 
+data when returning data, it isn't possible to specify type data directly when binding 
+parameters either (when binding multiple parameters, DBI has ability to set type data, 
+and when calling bind_param, this driver does not currently support type data in the 
+attributes).  Most conversions should work without problem, but there is ambiguity in 
+the Ruby Float type since it can be treated as float or double (or BigDecimal) in Java 
+(and FLOAT, DOUBLE, REAL, NUMERIC, DECIMAL, etc in java.sql.Types).  setDouble() is 
+used to try to retain the highest precision, but some problems have been seen (e.g. 
+Sybase REAL works better with setFloat()).  When doing inserts or retrieval, be sure 
+that the driver keeps the desired precision (the only workaround is to change the 
+database column type to something that works better for doubles with the given JDBC 
+driver and database)

data/Rakefile

@@ -28,11 +28,12 @@ Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date lis
 
 begin
   require 'hoe'
-  Hoe.new("dbd-jdbc", "0.0.4") do |p|
+  Hoe.new("dbd-jdbc", "0.0.5") do |p|
     p.rubyforge_name = "jruby-extras"
     p.url = "http://kenai.com/projects/dbd-jdbc"
     p.author = "Chad Johnson"
     p.email = "chad.j.johnson@gmail.com"
+    p.description = "A JDBC DBD driver for Ruby DBI"
     p.summary = "JDBC driver for DBI, originally by Kristopher Schmidt and Ola Bini"
   end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
 rescue LoadError

data/lib/dbd/Jdbc.rb

@@ -27,16 +27,54 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 require 'java'
-require File.dirname(__FILE__) + '/JdbcTypeConversions'
+
+begin
+  require 'rubygems'
+  gem 'dbi'
+rescue LoadError => e
+end
+
+require 'dbi'
 
 module DBI
   module DBD
+    #
+    # DBD::Jdbc - Database Driver for Java / JDBC
+    #
+    # Requires DBI and JRuby
+    #
     module Jdbc
-
       include_class 'java.sql.Connection'
       include_class 'java.sql.ResultSet'
+      include_class 'java.util.HashMap'
+      include_class 'java.util.Collections'
+
+      VERSION = "0.0.5"
+      DESCRIPTION = "JDBC DBD driver for JRuby"
 
-      VERSION = "0.0.4"
+      #
+      # Transaction isolation levels copied from JDBC
+      #
+      TRANSACTION_NONE = Connection::TRANSACTION_NONE
+      TRANSACTION_READ_COMMITTED = Connection::TRANSACTION_READ_COMMITTED
+      TRANSACTION_READ_UNCOMMITTED = Connection::TRANSACTION_READ_UNCOMMITTED
+      TRANSACTION_REPEATABLE_READ = Connection::TRANSACTION_REPEATABLE_READ
+      TRANSACTION_SERIALIZABLE = Connection::TRANSACTION_SERIALIZABLE 
+      # Convience isolation levels
+      NONE = Connection::TRANSACTION_NONE
+      READ_COMMITTED = Connection::TRANSACTION_READ_COMMITTED
+      READ_UNCOMMITTED = Connection::TRANSACTION_READ_UNCOMMITTED
+      REPEATABLE_READ = Connection::TRANSACTION_REPEATABLE_READ
+      SERIALIZABLE = Connection::TRANSACTION_SERIALIZABLE        
+        
+      #
+      # returns 'Jdbc'
+      #
+      # See DBI::TypeUtil#convert for more information.
+      #
+      def self.driver_name
+        "Jdbc"
+      end
 
       module Type
         class Timestamp < DBI::Type::Null
@@ -56,369 +94,20 @@ module DBI
           end
         end
       end
-        
-      def self.driver_name
-        "Jdbc"
-      end
-      
+
       #
       # Bound values pass through this function before being handed to Statement.bind_param
-      # 
+      #
       # The false value prevents the default type conversion from occurring
       #
       DBI::TypeUtil.register_conversion(driver_name) do |obj|
         [obj, false]
       end
-      
-      class Driver < DBI::BaseDriver
-
-        def initialize
-          super("0.4.0")
-          #attributes specific to this class.  All attributes in the
-          #connect attributes that aren't in this list will be
-          #applied to the database handle
-          @driverAttributes = [ "driver" ]
-        end
-
-        # Stolen from AR-JDBC
-        def driver_class(name)
-          return @driver_class if @driver_class
-
-          driver_class_const = (name[0...1].capitalize + name[1..name.length]).gsub(/\./, '_')
-          driver_class_name = name
-          Driver.module_eval do
-            include_class(driver_class_name) { driver_class_const }
-          end
-          driver_class = Driver.const_get(driver_class_const)
-          raise "You specify a driver for your JDBC connection" unless driver_class
-          @driver_class = driver_class
-        end
-
-        def load(name)
-          java.sql.DriverManager.registerDriver(driver_class(name).new)
-        end
-        
-        def connect(dbname, user, auth, attr)
-          driverClass = attr["driver"]
-          raise InterfaceError.new('driver class name must be specified as "driver" in connection attributes') unless driverClass
-          load(driverClass)
-          connection = java.sql.DriverManager.getConnection("jdbc:"+dbname, user, auth)
-          dbh = Database.new(connection)
-          (attr.keys - @driverAttributes).each { |key| dbh[key] = attr[key] }
-          return dbh
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-      end #Driver
-
-      class Database < DBI::BaseDatabase
-
-        include JdbcTypeConversions
-
-        def initialize(connection)
-          @connection = connection
-          @attributes = {
-            #works with Sybase and Mysql.
-            "nulltype" => java.sql.Types::VARCHAR,
-            "allow_scroll" => false
-          } 
-        end 
-
-        def disconnect
-          @connection.rollback unless self["autocommit"]
-          @connection.close
-        rescue NativeException => error  
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def prepare(sql)
-          if self["allow_scroll"]
-              return Statement.new(@connection.prepareStatement(sql,ResultSet::TYPE_SCROLL_INSENSITIVE, ResultSet::CONCUR_READ_ONLY), self["nulltype"], self["allow_scroll"])
-          else
-              return Statement.new(@connection.prepareStatement(sql), self["nulltype"], self["allow_scroll"])
-          end
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end 
-
-        def do(statement, *bindvars)
-          res = nil
-          if bindvars.nil? || bindvars.empty?
-            stmt = @connection.createStatement()
-            begin
-              stmt.execute(statement)
-            ensure
-              stmt.close rescue NativeException
-            end
-          else
-            stmt = execute(statement, *bindvars)
-            res = stmt.rows
-            stmt.finish
-          end
-          return res
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def ping
-          return !@connection.isClosed
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def commit
-          @connection.commit()
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def rollback
-          @connection.rollback()
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def tables
-          rs = @connection.getMetaData.getTables(nil, nil, nil, nil)
-          tables = []
-          while(rs.next())
-            tables << rs.getString(3)
-          end
-          return tables
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def columns(table)
-          metaData = @connection.getMetaData()
-          rs = metaData.getColumns(nil, nil, table, nil)
-          columns = []
-          while(rs.next())
-            type_name, dbi_type = jdbc_to_dbi_sqltype(rs.getShort(5))
-            columns << {
-              "name" => rs.getString(4),
-              "sql_type" => type_name,
-              "type_name" => rs.getString(6),
-              "precision" => rs.getInt(7),
-              "scale" => rs.getInt(9),
-              "default" => rs.getString(13),
-              "nullable" => (rs.getInt(11) == 1)
-            }
-            columns[-1]["dbi_type"] = dbi_type if dbi_type            
-          end
-          return columns
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def [](attribute)
-          attribute = attribute.downcase
-          check_attribute(attribute)
-          case attribute 
-          when "autocommit" then @connection.getAutoCommit()
-          else 
-            @attributes[attribute]
-          end
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def []=(attribute, value)
-          attribute = attribute.downcase
-          check_attribute(attribute)
-          case attribute
-          when "autocommit" then @connection.setAutoCommit(value)
-          else
-            @attributes[attribute] = value
-          end
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end
-
-        def __get_java_connection
-          return @connection
-        end
-        
-        def self.from_java_connection(java_connection, type_coercion = false)
-          DBI::DatabaseHandle.new(Database.new(java_connection), type_coercion)
-        end
-
-        private
-
-        def check_attribute(attribute)
-          raise DBI::NotSupportedError.new("Database attribute #{attribute} is not supported") unless (attribute == "autocommit" || @attributes.has_key?(attribute))
-        end
-
-      end
-
-      class Statement < DBI::BaseStatement
-
-        include JdbcTypeConversions
-
-        def initialize(statement, nulltype, allow_scroll = false)
-          @statement = statement
-          @nulltype = nulltype
-          @allow_scroll = allow_scroll
-          @rows = nil
-          @data = [] 
-        end
-
-        def bind_param(param, value, attribs)
-          raise InterfaceError.new("Statement.bind_param only supports numeric placeholder numbers") unless param.is_a?(Fixnum)
-          if value.nil?
-            @statement.setNull(param, @nulltype)
-          elsif value.is_a?(String)
-            @statement.setString(param, value)
-          elsif value.is_a?(Fixnum)
-            #no reason not to coerce it to a long?
-            @statement.setLong(param, value)
-          elsif value.is_a?(Float)
-            #despite DBD spec saying Float->SQL Float, using Double gives
-            #better precision and passes tests that setFloat does not. 
-            @statement.setDouble(param, value)
-          elsif value.is_a?(::DateTime) || value.is_a?(DBI::Timestamp)
-            @statement.setTimestamp(param, timestamp_to_jdbctimestamp(value))
-          elsif value.is_a?(::Date) || value.is_a?(DBI::Date)
-            @statement.setDate(param, date_to_jdbcdate(value))
-          elsif value.is_a?(::Time) || value.is_a?(DBI::Time)
-            @statement.setTime(param, time_to_jdbctime(value))
-          else
-            @statement.setObject(param, value)
-          end
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end  
-
-        def execute
-          if @statement.execute() 
-            @rs = @statement.getResultSet
-            @rows = nil
-            @data.clear
-          else
-            @rs = nil
-            @rows = @statement.getUpdateCount
-          end
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end  
-
-        def finish
-          @statement.close()
-          @rs = nil
-          @rows = nil
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end  
-
-        def fetch
-          if (@rs && @rs.next())
-            return fill_data
-          else
-            return nil
-          end
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end  
-
-        def fill_data
-          @data.clear
-          metaData = @rs.getMetaData()
-          (1..metaData.getColumnCount()).each do |columnNumber|
-            @data << get_value(columnNumber, @rs, metaData) 
-          end
-          return @data
-        end
-        
-        # 
-        # Unless "allow_scroll" was set on this connection this will default to the
-        # DBI::BaseStatement#fetch_scroll implementation.
-        # 
-        # See DBI::BaseStatement#fetch_scroll. These additional constants are supported 
-        # when "allow_scroll" is set on the connection.
-        #
-        # * DBI::SQL_FETCH_PRIOR: Fetch the row previous to the current one.
-        # * DBI::SQL_FETCH_FIRST: Fetch the first row.
-        # * DBI::SQL_FETCH_ABSOLUTE: Fetch the row at the offset provided.
-        # * DBI::SQL_FETCH_RELATIVE: Fetch the row at the current point + offset.
-        #
-        def fetch_scroll(direction, offset)
-            return super(direction, offset) unless @allow_scroll
-            
-            case direction
-            when DBI::SQL_FETCH_NEXT
-                fill_data if @rs && @rs.next()
-            when DBI::SQL_FETCH_PRIOR
-                fill_data if @rs && @rs.previous()
-            when DBI::SQL_FETCH_FIRST
-                fill_data if @rs && @rs.first()
-            when DBI::SQL_FETCH_LAST
-                fill_data if @rs && @rs.last()
-            when DBI::SQL_FETCH_ABSOLUTE
-                fill_data if @rs && @rs.absolute(offset) 
-            when DBI::SQL_FETCH_RELATIVE
-                fill_data if @rs && @rs.relative(offset) 
-            else
-                raise DBI::NotSupportedError
-            end
-        rescue NativeException => error
-          raise DBI::NotSupportedError.new(error.message)
-        end
-        
-        def column_info
-          info = Array.new
-          return info unless @rs
-          metaData = @rs.getMetaData()
-          (1..metaData.getColumnCount()).each do |columnNumber|
-            type_name, dbi_type = jdbc_to_dbi_sqltype(metaData.getColumnType(columnNumber))
-            info << {
-              "name" => metaData.getColumnName(columnNumber),
-              "sql_type" => type_name,
-              "type_name" => metaData.getColumnTypeName(columnNumber),
-              "precision" => metaData.getPrecision(columnNumber),
-              "scale" => metaData.getScale(columnNumber),
-              "nullable" => (metaData.isNullable(columnNumber) == 1)
-            } 
-            info[-1]["dbi_type"] = dbi_type if dbi_type
-          end
-          return info
-        rescue NativeException => error
-          raise DBI::DatabaseError.new(error.message)
-        end  
-
-        def rows
-          return @rows
-        end
-
-        def self.from_java_statement(java_statement, type_coercion = false, null_type = java.sql.Types::VARCHAR)
-          raise DBI::DatabaseError.new("Only java.sql.PreparedStatement instances accepted") unless java_statement.kind_of?(java.sql.PreparedStatement)
-          
-          DBI::StatementHandle.new(Statement.new(java_statement, null_type), true, true, type_coercion)
-        end
-
-        private 
-
-        def get_value(columnNumber, rs, metaData)
-          #note only map things that seem unlikely to coerce properly to jruby,
-          #since anything mapped as primitive type cannot be returned as null
-          return case metaData.getColumnType(columnNumber)
-          when java.sql.Types::BIT
-            rs.getBoolean(columnNumber)
-          when java.sql.Types::NUMERIC, java.sql.Types::DECIMAL
-            metaData.getScale(columnNumber) == 0 ? rs.getLong(columnNumber) : rs.getDouble(columnNumber)
-          when java.sql.Types::DATE
-            jdbcdate_to_date(rs.getDate(columnNumber))
-          when java.sql.Types::TIME
-            jdbctime_to_time(rs.getTime(columnNumber))
-          when java.sql.Types::TIMESTAMP
-            jdbctimestamp_to_timestamp(rs.getTimestamp(columnNumber))
-          else
-            rs.getObject(columnNumber)
-          end
-        end
-
-      end # class Statement
-
-    end # module Jdbc
-  end # module DBD
-end # module DBI
+    end
+  end
+end
+
+require 'dbd/jdbc/type_conversion'
+require 'dbd/jdbc/driver'
+require 'dbd/jdbc/database'
+require 'dbd/jdbc/statement'

data/lib/dbd/jdbc/database.rb

@@ -0,0 +1,178 @@
+#  (C) 2009 Chad Johnson <chad.j.johnson@gmail.com>.
+#  (C) 2008 Ola Bini <ola.bini@gmail.com>.
+#  (C) 2006 Kristopher Schmidt <krisschmidt@optonline.net>.
+#
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. The name of the author may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+#  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+#  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+#  THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+module DBI::DBD::Jdbc
+  #
+  # Models the DBI::BaseDatabase API to create DBI::DatabaseHandle objects.
+  #
+  class Database < DBI::BaseDatabase
+    include TypeConversions
+
+    def initialize(connection)
+      @connection = connection
+      @attributes = {
+        #works with Sybase and Mysql.
+        "nulltype" => java.sql.Types::VARCHAR,
+        "allow_scroll" => false
+      }
+    end
+
+    def disconnect
+      @connection.rollback unless self["autocommit"]
+      @connection.close
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def prepare(sql)
+      if self["allow_scroll"]
+        return Statement.new(@connection.prepareStatement(sql,ResultSet::TYPE_SCROLL_INSENSITIVE, ResultSet::CONCUR_READ_ONLY), self["nulltype"], self["allow_scroll"])
+      else
+        return Statement.new(@connection.prepareStatement(sql), self["nulltype"], self["allow_scroll"])
+      end
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def do(statement, *bindvars)
+        res = nil
+        if bindvars.nil? || bindvars.empty?
+          stmt = @connection.createStatement()
+          begin
+            stmt.execute(statement)
+          ensure
+            stmt.close rescue NativeException
+          end
+        else
+          stmt = execute(statement, *bindvars)
+          res = stmt.rows
+          stmt.finish
+        end
+        return res
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def ping
+        return !@connection.isClosed
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def commit
+        @connection.commit()
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def rollback
+        @connection.rollback()
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def tables
+        rs = @connection.getMetaData.getTables(nil, nil, nil, nil)
+        tables = []
+        while(rs.next())
+          tables << rs.getString(3)
+        end
+        return tables
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def columns(table)
+        (table,schema,db) = table.split(".").reverse
+          
+        metaData = @connection.getMetaData()
+        rs = metaData.getColumns(db, schema, table, nil)
+        columns = []
+        while(rs.next())
+          type_name, dbi_type = jdbc_to_dbi_sqltype(rs.getShort(5))
+          columns << {
+            "name" => rs.getString(4),
+            "sql_type" => type_name,
+            "type_name" => rs.getString(6),
+            "precision" => rs.getInt(7),
+            "scale" => rs.getInt(9),
+            "default" => rs.getString(13),
+            "nullable" => (rs.getInt(11) == 1)
+          }
+          columns[-1]["dbi_type"] = dbi_type if dbi_type
+        end
+        return columns
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def [](attribute)
+        attribute = attribute.downcase
+        check_attribute(attribute)
+        case attribute
+        when "autocommit" then @connection.getAutoCommit()
+        when "isolation" || "isolation_level" then @connection.getTransactionIsolation()
+        else
+          @attributes[attribute]
+        end
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def []=(attribute, value)
+        attribute = attribute.downcase
+        check_attribute(attribute)
+        case attribute
+        when "autocommit" then @connection.setAutoCommit(value)
+        when "isolation" || "isolation_level" then @connection.setTransactionIsolation(value)
+        else
+          @attributes[attribute] = value
+        end
+      rescue NativeException => error
+        raise DBI::DatabaseError.new(error.message)
+      end
+
+      def java_connection
+        return @connection
+      end
+
+      def self.from_java_connection(java_connection, type_coercion = false)
+        DBI::DatabaseHandle.new(Database.new(java_connection), type_coercion)
+      end
+
+      private
+
+      def check_attribute(attribute)
+          raise DBI::NotSupportedError.new("Database attribute #{attribute} is not supported") unless (attribute == "autocommit" ||
+                                                                                                       attribute == "isolation" ||
+                                                                                                       attribute == "isolation_level" ||
+                                                                                                       @attributes.has_key?(attribute))
+      end
+
+    end
+  end # module DBI

data/lib/dbd/jdbc/driver.rb

@@ -0,0 +1,70 @@
+#  (C) 2009 Chad Johnson <chad.j.johnson@gmail.com>.
+#  (C) 2008 Ola Bini <ola.bini@gmail.com>.
+#  (C) 2006 Kristopher Schmidt <krisschmidt@optonline.net>.
+#
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. The name of the author may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+#  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+#  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+#  THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+module DBI::DBD::Jdbc
+  #
+  # Models the DBI::BaseDriver API to create DBI::DriverHandle objects.
+  #
+  class Driver < DBI::BaseDriver
+
+    def initialize
+      super("0.4.0")
+      #attributes specific to this class.  All attributes in the
+      #connect attributes that aren't in this list will be
+      #applied to the database handle
+      @driverAttributes = [ "driver" ]
+      @loaded_drivers = Collections.synchronizedMap(HashMap.new)
+    end
+
+    def load(name)
+      unless @loaded_drivers.containsKey(name)
+        clazz = java.lang.Class.forName(name,true,JRuby.runtime.jruby_class_loader)
+        java.sql.DriverManager.registerDriver(clazz.newInstance)
+        
+        @loaded_drivers.put(name,true)
+      end
+    end
+
+    def connect(dbname, user, auth, attr)
+      driverClass = attr["driver"]
+      raise InterfaceError.new('driver class name must be specified as "driver" in connection attributes') unless driverClass
+
+      load(driverClass)
+
+      connection = java.sql.DriverManager.getConnection("jdbc:"+dbname, user, auth)
+      dbh = Database.new(connection)
+
+      (attr.keys - @driverAttributes).each { |key| dbh[key] = attr[key] }
+
+      return dbh
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+  end #Driver
+end

data/lib/dbd/jdbc/statement.rb

@@ -0,0 +1,199 @@
+#  (C) 2009 Chad Johnson <chad.j.johnson@gmail.com>.
+#  (C) 2008 Ola Bini <ola.bini@gmail.com>.
+#  (C) 2006 Kristopher Schmidt <krisschmidt@optonline.net>.
+#
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. The name of the author may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+#  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+#  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+#  THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+module DBI::DBD::Jdbc
+  #
+  # Models the DBI::BaseStatement API to create DBI::StatementHandle objects.
+  #
+  class Statement < DBI::BaseStatement
+    include TypeConversions
+
+    def initialize(statement, nulltype, allow_scroll = false)
+      @statement = statement
+      @nulltype = nulltype
+      @allow_scroll = allow_scroll
+      @rows = nil
+      @data = []
+    end
+
+    def bind_param(param, value, attribs)
+      raise InterfaceError.new("Statement.bind_param only supports numeric placeholder numbers") unless param.is_a?(Fixnum)
+      if value.nil?
+        @statement.setNull(param, @nulltype)
+      elsif value.is_a?(String)
+        @statement.setString(param, value)
+      elsif value.is_a?(Fixnum)
+        #no reason not to coerce it to a long?
+        @statement.setLong(param, value)
+      elsif value.is_a?(Float)
+        #despite DBD spec saying Float->SQL Float, using Double gives
+        #better precision and passes tests that setFloat does not.
+        @statement.setDouble(param, value)
+      elsif value.is_a?(::DateTime) || value.is_a?(DBI::Timestamp)
+        @statement.setTimestamp(param, timestamp_to_jdbctimestamp(value))
+      elsif value.is_a?(::Date) || value.is_a?(DBI::Date)
+        @statement.setDate(param, date_to_jdbcdate(value))
+      elsif value.is_a?(::Time) || value.is_a?(DBI::Time)
+        @statement.setTime(param, time_to_jdbctime(value))
+      else
+        @statement.setObject(param, value)
+      end
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def execute
+      if @statement.execute()
+        @rs = @statement.getResultSet
+        @rows = nil
+        @data.clear
+      else
+        @rs = nil
+        @rows = @statement.getUpdateCount
+      end
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def finish
+      @statement.close()
+      @rs = nil
+      @rows = nil
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def fetch
+      if (@rs && @rs.next())
+        return fill_data
+      else
+        return nil
+      end
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def fill_data
+      @data.clear
+      metaData = @rs.getMetaData()
+      (1..metaData.getColumnCount()).each do |columnNumber|
+        @data << get_value(columnNumber, @rs, metaData)
+      end
+      return @data
+    end
+
+    #
+    # Unless "allow_scroll" was set on this connection this will default to the
+    # DBI::BaseStatement#fetch_scroll implementation.
+    #
+    # See DBI::BaseStatement#fetch_scroll. These additional constants are supported
+    # when "allow_scroll" is set on the connection.
+    #
+    # * DBI::SQL_FETCH_PRIOR: Fetch the row previous to the current one.
+    # * DBI::SQL_FETCH_FIRST: Fetch the first row.
+    # * DBI::SQL_FETCH_ABSOLUTE: Fetch the row at the offset provided.
+    # * DBI::SQL_FETCH_RELATIVE: Fetch the row at the current point + offset.
+    #
+    def fetch_scroll(direction, offset)
+      return super(direction, offset) unless @allow_scroll
+
+      case direction
+      when DBI::SQL_FETCH_NEXT
+        fill_data if @rs && @rs.next()
+      when DBI::SQL_FETCH_PRIOR
+        fill_data if @rs && @rs.previous()
+      when DBI::SQL_FETCH_FIRST
+        fill_data if @rs && @rs.first()
+      when DBI::SQL_FETCH_LAST
+        fill_data if @rs && @rs.last()
+      when DBI::SQL_FETCH_ABSOLUTE
+        fill_data if @rs && @rs.absolute(offset)
+      when DBI::SQL_FETCH_RELATIVE
+        fill_data if @rs && @rs.relative(offset)
+      else
+        raise DBI::NotSupportedError
+      end
+    rescue NativeException => error
+      raise DBI::NotSupportedError.new(error.message)
+    end
+
+    def column_info
+      info = Array.new
+      return info unless @rs
+      metaData = @rs.getMetaData()
+      (1..metaData.getColumnCount()).each do |columnNumber|
+        type_name, dbi_type = jdbc_to_dbi_sqltype(metaData.getColumnType(columnNumber))
+        info << {
+          "name" => metaData.getColumnName(columnNumber),
+          "sql_type" => type_name,
+          "type_name" => metaData.getColumnTypeName(columnNumber),
+          "precision" => metaData.getPrecision(columnNumber),
+          "scale" => metaData.getScale(columnNumber),
+          "nullable" => (metaData.isNullable(columnNumber) == 1)
+        }
+        info[-1]["dbi_type"] = dbi_type if dbi_type
+      end
+      return info
+    rescue NativeException => error
+      raise DBI::DatabaseError.new(error.message)
+    end
+
+    def rows
+      return @rows
+    end
+
+    def self.from_java_statement(java_statement, type_coercion = false, null_type = java.sql.Types::VARCHAR)
+      raise DBI::DatabaseError.new("Only java.sql.PreparedStatement instances accepted") unless java_statement.kind_of?(java.sql.PreparedStatement)
+
+      DBI::StatementHandle.new(Statement.new(java_statement, null_type), true, true, type_coercion)
+    end
+
+    private
+
+    def get_value(columnNumber, rs, metaData)
+      #note only map things that seem unlikely to coerce properly to jruby,
+      #since anything mapped as primitive type cannot be returned as null
+      return case metaData.getColumnType(columnNumber)
+      when java.sql.Types::BIT
+        rs.getBoolean(columnNumber)
+      when java.sql.Types::NUMERIC, java.sql.Types::DECIMAL
+        metaData.getScale(columnNumber) == 0 ? rs.getLong(columnNumber) : rs.getDouble(columnNumber)
+      when java.sql.Types::DATE
+        jdbcdate_to_date(rs.getDate(columnNumber))
+      when java.sql.Types::TIME
+        jdbctime_to_time(rs.getTime(columnNumber))
+      when java.sql.Types::TIMESTAMP
+        jdbctimestamp_to_timestamp(rs.getTimestamp(columnNumber))
+      else
+        rs.getObject(columnNumber)
+      end
+    end
+
+  end # class Statement
+
+end # module Jdbc

data/lib/dbd/{JdbcTypeConversions.rb → jdbc/type_conversion.rb}

@@ -26,32 +26,31 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-module JdbcTypeConversions
-
+module DBI::DBD::Jdbc::TypeConversions
   include_class 'java.util.Calendar'
   include_class 'java.sql.Types'
 
   def jdbc_to_dbi_sqltype(jdbctype)
     return case jdbctype
-       when Types::BIGINT then [DBI::SQL_BIGINT, nil]
-       when Types::BINARY then [DBI::SQL_BINARY, nil]
-       when Types::BIT then [DBI::SQL_BIT, nil]
-       when Types::CHAR then [DBI::SQL_CHAR, nil]
-       when Types::DATE then [DBI::SQL_DATE, DBI::DBD::Jdbc::Type::Timestamp]
-       when Types::DECIMAL then [DBI::SQL_DECIMAL, nil]
-       when Types::DOUBLE then [DBI::SQL_DOUBLE, nil]
-       when Types::FLOAT then [DBI::SQL_FLOAT, nil]
-       when Types::INTEGER then [DBI::SQL_INTEGER, nil]
-       when Types::LONGVARBINARY then [DBI::SQL_LONGVARBINARY, nil]
-       when Types::LONGVARCHAR then [DBI::SQL_LONGVARCHAR, nil]
-       when Types::NUMERIC then [DBI::SQL_NUMERIC, nil]
-       when Types::REAL then [DBI::SQL_REAL, nil]
-       when Types::SMALLINT then [DBI::SQL_SMALLINT, nil]
-       when Types::TIME then [DBI::SQL_TIME, DBI::DBD::Jdbc::Type::Timestamp]
-       when Types::TIMESTAMP then [DBI::SQL_TIMESTAMP, DBI::DBD::Jdbc::Type::Timestamp]
-       when Types::TINYINT then [DBI::SQL_TINYINT, nil]
-       when Types::VARBINARY then [DBI::SQL_VARBINARY, nil]
-       when Types::VARCHAR then [DBI::SQL_VARCHAR, nil]
+    when Types::BIGINT then [DBI::SQL_BIGINT, nil]
+    when Types::BINARY then [DBI::SQL_BINARY, nil]
+    when Types::BIT then [DBI::SQL_BIT, nil]
+    when Types::CHAR then [DBI::SQL_CHAR, nil]
+    when Types::DATE then [DBI::SQL_DATE, DBI::DBD::Jdbc::Type::Timestamp]
+    when Types::DECIMAL then [DBI::SQL_DECIMAL, nil]
+    when Types::DOUBLE then [DBI::SQL_DOUBLE, nil]
+    when Types::FLOAT then [DBI::SQL_FLOAT, nil]
+    when Types::INTEGER then [DBI::SQL_INTEGER, nil]
+    when Types::LONGVARBINARY then [DBI::SQL_LONGVARBINARY, nil]
+    when Types::LONGVARCHAR then [DBI::SQL_LONGVARCHAR, nil]
+    when Types::NUMERIC then [DBI::SQL_NUMERIC, nil]
+    when Types::REAL then [DBI::SQL_REAL, nil]
+    when Types::SMALLINT then [DBI::SQL_SMALLINT, nil]
+    when Types::TIME then [DBI::SQL_TIME, DBI::DBD::Jdbc::Type::Timestamp]
+    when Types::TIMESTAMP then [DBI::SQL_TIMESTAMP, DBI::DBD::Jdbc::Type::Timestamp]
+    when Types::TINYINT then [DBI::SQL_TINYINT, nil]
+    when Types::VARBINARY then [DBI::SQL_VARBINARY, nil]
+    when Types::VARCHAR then [DBI::SQL_VARCHAR, nil]
     else
       [DBI::SQL_OTHER, nil]
     end

metadata

@@ -18,16 +18,21 @@ name: dbd-jdbc
 rdoc_options: 
 - --main
 - README.txt
-autorequire: 
 rubyforge_project: jruby-extras
+autorequire: 
+licenses: []
+
 executables: []
 
-description: 
-specification_version: 2
+description: A JDBC DBD driver for Ruby DBI
+specification_version: 3
 default_executable: 
 files: 
-- lib/dbd/JdbcTypeConversions.rb
 - lib/dbd/Jdbc.rb
+- lib/dbd/jdbc/database.rb
+- lib/dbd/jdbc/driver.rb
+- lib/dbd/jdbc/statement.rb
+- lib/dbd/jdbc/type_conversion.rb
 - Rakefile
 - README.txt
 required_rubygems_version: !ruby/object:Gem::Requirement 
@@ -38,17 +43,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 extensions: []
 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 requirements: []
 
 authors: 
 - Chad Johnson
-date: 2009-03-11 00:00:00 Z
+date: 2009-05-16 05:00:00 +00:00
 platform: ruby
 test_files: []
 
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 require_paths: 
 - lib
 dependencies: []