activerecord-jdbc-adapter 0.8 → 0.8.1

data/History.txt

@@ -1,3 +1,24 @@
+== 0.8.1
+
+- Now sporting a JDBC sqlite3 adapter! Thanks Joseph Athman.
+- Added support for InterSystems Cache database (Ryan Bell)
+- Fix for JRUBY-2256
+- JRUBY-1638, JRUBY-2404, JRUBY-2463: schema.table handling and Oracle NUMBER fixes (Darcy Schultz & Jesse Hu)
+- Add structure dump and other DDL-ish for DB2 (courtesy abedra and stuarthalloway)
+- Fix missing quote_table_name function under Rails 1.2.6 and earlier
+- Small tweaks to jdbc.rake to select proper config
+- JRUBY-2011: Fix MSSQL string un-quoting issue (Silvio Fonseca)
+- JRUBY-1977, 17427: Fix information_schema select issue with MSSQL (Matt Burke)
+- 20479: Improve get_table_name for MSSQL (Aslak Hellesøy)
+- 20243: numerics improvements for MSSQL (Aslak Hellesøy)
+- 20172: don't quote table names for MSSQL (Thor Marius Henrichsen)
+- 19729: check for primary key existence in postgres during insert (Martin Luder)
+- JRUBY-2297, 18846: retrying failing SQL statements is harmful when not autocommitting (Craig McMillan)
+- 10021: very preliminary sybase support. (Mark Atkinson) Not usable until collision w/ sqlserver driver is resolved.
+- JRUBY-2312, JRUBY-2319, JRUBY-2322: Oracle timestamping issues (Jesse Hu & Michael König)
+- JRUBY-2422: Fix MySQL referential integrity and rollback issues
+- JRUBY-2382: mysql string quoting fails with ArrayIndexOutofBoundsException
+
 == 0.8
 
 - NOTE: This release is only compatible with JRuby 1.1RC3 or later.

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.txt
 Rakefile
 LICENSE.txt
+lib/active_record/connection_adapters/cachedb_adapter.rb
 lib/active_record/connection_adapters/derby_adapter.rb
 lib/active_record/connection_adapters/h2_adapter.rb
 lib/active_record/connection_adapters/hsqldb_adapter.rb
@@ -12,6 +13,8 @@ lib/active_record/connection_adapters/jndi_adapter.rb
 lib/active_record/connection_adapters/mysql_adapter.rb
 lib/active_record/connection_adapters/oracle_adapter.rb
 lib/active_record/connection_adapters/postgresql_adapter.rb
+lib/active_record/connection_adapters/sqlite3_adapter.rb
+lib/jdbc_adapter/jdbc_cachedb.rb
 lib/jdbc_adapter/jdbc_db2.rb
 lib/jdbc_adapter/jdbc_derby.rb
 lib/jdbc_adapter/jdbc_firebird.rb
@@ -21,13 +24,18 @@ lib/jdbc_adapter/jdbc_mssql.rb
 lib/jdbc_adapter/jdbc_mysql.rb
 lib/jdbc_adapter/jdbc_oracle.rb
 lib/jdbc_adapter/jdbc_postgre.rb
+lib/jdbc_adapter/jdbc_sqlite3.rb
+lib/jdbc_adapter/jdbc_sybase.rb
 lib/jdbc_adapter/missing_functionality_helper.rb
 lib/jdbc_adapter/rake_tasks.rb
+lib/jdbc_adapter/tsql_helper.rb
 lib/jdbc_adapter/version.rb
 lib/jdbc_adapter.rb
 lib/jdbc_adapter/jdbc_adapter_internal.jar
 test/activerecord/connection_adapters/type_conversion_test.rb
 test/activerecord/connections/native_jdbc_mysql/connection.rb
+test/cachedb_simple_test.rb
+test/db/cachedb.rb
 test/db/db2.rb
 test/db/derby.rb
 test/db/h2.rb
@@ -35,9 +43,11 @@ test/db/hsqldb.rb
 test/db/jdbc.rb
 test/db/jndi_config.rb
 test/db/logger.rb
+test/db/mssql.rb
 test/db/mysql.rb
 test/db/oracle.rb
 test/db/postgres.rb
+test/db/sqlite3.rb
 test/db2_simple_test.rb
 test/derby_multibyte_test.rb
 test/derby_simple_test.rb
@@ -61,12 +71,14 @@ test/models/auto_id.rb
 test/models/data_types.rb
 test/models/entry.rb
 test/models/reserved_word.rb
+test/mssql_simple_test.rb
 test/mysql_multibyte_test.rb
 test/mysql_simple_test.rb
 test/oracle_simple_test.rb
 test/postgres_reserved_test.rb
 test/postgres_simple_test.rb
 test/simple.rb
+test/sqlite3_simple_test.rb
 lib/jdbc_adapter/jdbc.rake
 src/java/jdbc_adapter/JdbcAdapterInternalService.java
 src/java/jdbc_adapter/JdbcConnectionFactory.java

data/README.txt

@@ -26,6 +26,7 @@ What's there, and what is not there:
   * rename_column
 * HSQLDB - Complete
 * H2 - Complete
+* SQLite3 - work in progress
 
 Other databases will require testing and likely a custom configuration module. Please join the jruby-extras mailing-list[http://rubyforge.org/mail/?group_id=2014] to help us discover support for more databases.
 

data/Rakefile

@@ -5,14 +5,16 @@ task :default => [:java_compile, :test]
 
 def java_classpath_arg # myriad of ways to discover JRuby classpath
   begin
-    jruby_cpath = Java::java.lang.System.getProperty('java.class.path')
+    cpath  = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
+    cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
+    jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
   rescue => e
   end
   unless jruby_cpath
     jruby_cpath = ENV['JRUBY_PARENT_CLASSPATH'] || ENV['JRUBY_HOME'] &&
       FileList["#{ENV['JRUBY_HOME']}/lib/*.jar"].join(File::PATH_SEPARATOR)
   end
-  jruby_cpath ? "-cp #{jruby_cpath}" : ""
+  jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
 end
 
 desc "Compile the native Java code."
@@ -25,23 +27,13 @@ task :java_compile do
 end
 file "lib/jdbc_adapter/jdbc_adapter_internal.jar" => :java_compile
 
-task :more_clean do
-  rm_rf FileList['derby*']
-  rm_rf FileList['test.db.*']
-  rm_rf "test/reports"
-  rm_f FileList['lib/**/*.jar']
-  rm_f "manifest.mf"
-end
-
-task :clean => :more_clean
-
 task :filelist do
   puts FileList['pkg/**/*'].inspect
 end
 
 if RUBY_PLATFORM =~ /java/
   # TODO: add more databases into the standard tests here.
-  task :test => [:test_mysql, :test_jdbc, :test_derby, :test_hsqldb, :test_h2]
+  task :test => [:test_mysql, :test_jdbc, :test_derby, :test_hsqldb, :test_h2, :test_sqlite3]
 else
   task :test => [:test_mysql]
 end
@@ -85,6 +77,17 @@ Rake::TestTask.new(:test_db2) do |t|
   t.libs << 'test'
 end
 
+# Ensure InterSystems CacheDB driver is on your classpath before launching rake
+Rake::TestTask.new(:test_cachedb) do | t |
+  t.test_files = FileList[ 'test/cachedb_simple_test.rb' ]
+  t.libs << 'test'
+end
+
+# Ensure that the jTDS driver in on your classpath before launching rake
+Rake::TestTask.new(:test_mssql) do | t |
+  t.test_files = FileList[ 'test/mssql_simple_test.rb' ]
+  t.libs << 'test'
+end
 
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", 
   "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/jdbc_adapter/jdbc_adapter_internal.jar", "test/**/*.rb",
@@ -159,3 +162,6 @@ end
     task "all:release" => "#{prefix}:release"
   end
 end
+
+require 'rake/clean'
+CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf'

data/lib/active_record/connection_adapters/cachedb_adapter.rb

@@ -0,0 +1 @@
+require 'active_record/connection_adapters/jdbc_adapter'

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -135,6 +135,7 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^decimal$/i},
                           lambda {|r| r['type_name'] =~ /^numeric$/i},
                           lambda {|r| r['type_name'] =~ /^number$/i},
+                          lambda {|r| r['type_name'] =~ /^real$/i},
                           lambda {|r| r['precision'] == '38'},
                           lambda {|r| r['data_type'] == '2'}],
         :float       => [ lambda {|r| [Jdbc::Types::FLOAT,Jdbc::Types::DOUBLE, Jdbc::Types::REAL].include?(r['data_type'].to_i)},
@@ -146,17 +147,21 @@ module ActiveRecord
         :datetime    => [ lambda {|r| Jdbc::Types::TIMESTAMP == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^datetime$/i},
                           lambda {|r| r['type_name'] =~ /^timestamp$/i},
-                          lambda {|r| r['type_name'] =~ /^date/i}],
+                          lambda {|r| r['type_name'] =~ /^date/i},
+                          lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :timestamp   => [ lambda {|r| Jdbc::Types::TIMESTAMP == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^timestamp$/i},
                           lambda {|r| r['type_name'] =~ /^datetime/i},
-                          lambda {|r| r['type_name'] =~ /^date/i}],
+                          lambda {|r| r['type_name'] =~ /^date/i},
+                          lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :time        => [ lambda {|r| Jdbc::Types::TIME == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^time$/i},
-                          lambda {|r| r['type_name'] =~ /^date/i}],
+                          lambda {|r| r['type_name'] =~ /^date/i},
+                          lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :date        => [ lambda {|r| Jdbc::Types::DATE == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^date$/i},
-                          lambda {|r| r['type_name'] =~ /^date/i}],
+                          lambda {|r| r['type_name'] =~ /^date/i},
+                          lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver3
         :binary      => [ lambda {|r| [Jdbc::Types::LONGVARBINARY,Jdbc::Types::BINARY,Jdbc::Types::BLOB].include?(r['data_type'].to_i)},
                           lambda {|r| r['type_name'] =~ /^blob/i},
                           lambda {|r| r['type_name'] =~ /sub_type 0$/i}, # For FireBird
@@ -166,7 +171,8 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^bool/i},
                           lambda {|r| r['data_type'] == '-7'},
                           lambda {|r| r['type_name'] =~ /^tinyint$/i},
-                          lambda {|r| r['type_name'] =~ /^decimal$/i}]
+                          lambda {|r| r['type_name'] =~ /^decimal$/i},
+                          lambda {|r| r['type_name'] =~ /^integer$/i}]
       }
 
       def initialize(types)
@@ -414,8 +420,19 @@ module ActiveRecord
       end
     end
 
+    module CompatibilityMethods
+      def self.needed?(base)
+        !base.instance_methods.include?("quote_table_name")
+      end
+
+      def quote_table_name(name)
+        quote_column_name(name)
+      end
+    end
+
     class JdbcAdapter < AbstractAdapter
       extend ShadowCoreMethods
+      include CompatibilityMethods if CompatibilityMethods.needed?(self)
 
       attr_reader :config
 

data/lib/active_record/connection_adapters/jdbc_adapter_spec.rb

@@ -8,3 +8,6 @@ require 'jdbc_adapter/jdbc_derby'
 require 'jdbc_adapter/jdbc_firebird'
 require 'jdbc_adapter/jdbc_db2'
 require 'jdbc_adapter/jdbc_mssql'
+require 'jdbc_adapter/jdbc_cachedb'
+require 'jdbc_adapter/jdbc_sqlite3'
+require 'jdbc_adapter/jdbc_sybase'

data/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -0,0 +1,13 @@
+tried_gem = false
+begin
+  require "jdbc/sqlite3"
+rescue LoadError
+  unless tried_gem
+    require 'rubygems'
+    gem "jdbc-sqlite3"
+    tried_gem = true
+    retry
+  end
+  # trust that the sqlite jar is already present
+end
+require 'active_record/connection_adapters/jdbc_adapter'

data/lib/jdbc_adapter/jdbc.rake

@@ -10,44 +10,46 @@ def redefine_task(*args, &block)
 end
 
 namespace :db do
-  redefine_task :create => :environment do
-    create_database(ActiveRecord::Base.configurations[RAILS_ENV])
-  end
+  if Rake::Task["db:create"]
+    redefine_task :create => :environment do
+      create_database(ActiveRecord::Base.configurations[RAILS_ENV])
+    end
 
-  class << self; alias_method :previous_create_database, :create_database; end
-  def create_database(config)
-    begin
-      ActiveRecord::Base.establish_connection(config)
-      ActiveRecord::Base.connection
-    rescue
+    class << self; alias_method :previous_create_database, :create_database; end
+    def create_database(config)
       begin
-        url = config['url']
-        if url
-          if url =~ /^(.*\/)/
-            url = $1
+        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.connection
+      rescue
+        begin
+          url = config['url']
+          if url
+            if url =~ /^(.*\/)/
+              url = $1
+            end
           end
+
+          ActiveRecord::Base.establish_connection(config.merge({'database' => nil, 'url' => url}))
+          ActiveRecord::Base.connection.create_database(config['database'])
+          ActiveRecord::Base.establish_connection(config)
+        rescue
+          previous_create_database(config)
         end
+      end
+    end
 
-        ActiveRecord::Base.establish_connection(config.merge({'database' => nil, 'url' => url}))
-        ActiveRecord::Base.connection.create_database(config['database'])
+    redefine_task :drop => :environment do
+      config = ActiveRecord::Base.configurations[RAILS_ENV]
+      begin
         ActiveRecord::Base.establish_connection(config)
+        db = ActiveRecord::Base.connection.database_name
+        ActiveRecord::Base.connection.drop_database(db)
       rescue
-        previous_create_database(config)
+        drop_database(config)
       end
     end
   end
 
-  redefine_task :drop => :environment do
-    config = ActiveRecord::Base.configurations[RAILS_ENV]
-    begin
-      ActiveRecord::Base.establish_connection(config)
-      db = ActiveRecord::Base.connection.database_name
-      ActiveRecord::Base.connection.drop_database(db)
-    rescue
-      drop_database(config)
-    end
-  end
-
   namespace :structure do
     redefine_task :dump => :environment do
       abcs = ActiveRecord::Base.configurations
@@ -58,10 +60,11 @@ namespace :db do
       end
     end
   end
+
   namespace :test do
     redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.establish_connection(:test)
+      ActiveRecord::Base.establish_connection(abcs[:test])
       ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') if abcs["test"]["adapter"] =~ /mysql/i
       IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
         ActiveRecord::Base.connection.execute(ddl)
@@ -70,7 +73,7 @@ namespace :db do
 
     redefine_task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.establish_connection(:test)
+      ActiveRecord::Base.establish_connection(abcs[:test])
       db = ActiveRecord::Base.connection.database_name
       ActiveRecord::Base.connection.recreate_database(db)
     end

data/lib/jdbc_adapter/jdbc_cachedb.rb

@@ -0,0 +1,33 @@
+require 'jdbc_adapter/tsql_helper'
+
+module ::JdbcSpec
+  module ActiveRecordExtensions
+    def cachedb_connection( config )
+      config[:port] ||= 1972
+      config[:url] ||= "jdbc:Cache://#{config[:host]}:#{config[:port]}/#{ config[:database]}"
+      config[:driver] ||= "com.intersys.jdbc.CacheDriver"
+      jdbc_connection( config )
+    end
+  end
+
+  module CacheDB
+    include TSqlMethods
+
+    def self.column_selector
+      [ /cache/i, lambda {  | cfg, col | col.extend( ::JdbcSpec::CacheDB::Column ) } ]
+    end
+
+    def self.adapter_selector
+      [ /cache/i, lambda {  | cfg, adapt | adapt.extend( ::JdbcSpec::CacheDB ) } ]
+    end
+
+    module Column
+    end
+    
+    def create_table(name, options = { })
+      super(name, options)
+      primary_key = options[:primary_key] || "id"
+      execute "ALTER TABLE #{name} ADD CONSTRAINT #{name}_PK PRIMARY KEY(#{primary_key})" unless options[:id] == false
+    end
+  end
+end

data/lib/jdbc_adapter/jdbc_db2.rb

@@ -17,14 +17,14 @@ module JdbcSpec
            adapt.extend(::JdbcSpec::DB2)
          end }]
     end
-    
+
     module Column
       def type_cast(value)
         return nil if value.nil? || value =~ /^\s*null\s*$/i
         case type
         when :string    then value
         when :integer   then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
-        when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0) 
+        when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
         when :float     then value.to_f
         when :datetime  then cast_to_date_or_time(value)
         when :timestamp then cast_to_time(value)
@@ -50,7 +50,7 @@ module JdbcSpec
         Date.new(value.year, value.month, value.day) : value
       end
     end
-    
+
     def modify_types(tp)
       tp[:primary_key] = 'int generated by default as identity (start with 42) primary key'
       tp[:string][:limit] = 255
@@ -58,7 +58,7 @@ module JdbcSpec
       tp[:boolean][:limit] = nil
       tp
     end
-    
+
     def add_limit_offset!(sql, options)
       if limit = options[:limit]
         offset = options[:offset] || 0
@@ -66,7 +66,7 @@ module JdbcSpec
         sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset}"
       end
     end
-    
+
     def quote_column_name(column_name)
       column_name
     end
@@ -79,7 +79,7 @@ module JdbcSpec
         return value.to_s
       end
       case value
-      when String                
+      when String
         if column && column.type == :binary
           "BLOB('#{quote_string(value)}')"
         else
@@ -88,7 +88,7 @@ module JdbcSpec
       else super
       end
     end
-    
+
     def quote_string(string)
       string.gsub(/'/, "''") # ' (for ruby-mode)
     end
@@ -100,5 +100,94 @@ module JdbcSpec
     def quoted_false
       '0'
     end
+
+    def recreate_database(name)
+      do_not_drop = ["stmg_dbsize_info","hmon_atm_info","hmon_collection","policy"]
+      tables.each do |table|
+        unless do_not_drop.include?(table)
+          drop_table(table)
+        end
+      end
+    end
+
+    def remove_index(table_name, options = { })
+      execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
+    end
+
+    # This method makes tests pass without understanding why.
+    # Don't use this in production.
+    def columns(table_name, name = nil)
+      super.select do |col|
+        # strip out "magic" columns from DB2 (?)
+        !/rolename|roleid|create_time|auditpolicyname|auditpolicyid|remarks/.match(col.name)
+      end
+    end
+
+    def add_quotes(name)
+      return name unless name
+      %Q{"#{name}"}
+    end
+
+    def strip_quotes(str)
+      return str unless str
+      return str unless /^(["']).*\1$/ =~ str
+      str[1..-2]
+    end
+
+    def expand_double_quotes(name)
+      return name unless name && name['"']
+      name.gsub(/"/,'""')
+    end
+
+
+    def structure_dump #:nodoc:
+      definition=""
+      rs = @connection.connection.meta_data.getTables(nil,nil,nil,["TABLE"].to_java(:string))
+      while rs.next
+        tname = rs.getString(3)
+        definition << "CREATE TABLE #{tname} (\n"
+        rs2 = @connection.connection.meta_data.getColumns(nil,nil,tname,nil)
+        first_col = true
+        while rs2.next
+          col_name = add_quotes(rs2.getString(4));
+          default = ""
+          d1 = rs2.getString(13)
+          default = d1 ? " DEFAULT #{d1}" : ""
+
+          type = rs2.getString(6)
+          col_size = rs2.getString(7)
+          nulling = (rs2.getString(18) == 'NO' ? " NOT NULL" : "")
+          create_col_string = add_quotes(expand_double_quotes(strip_quotes(col_name))) +
+            " " +
+            type +
+            "" +
+            nulling +
+            default
+          if !first_col
+            create_col_string = ",\n #{create_col_string}"
+          else
+            create_col_string = " #{create_col_string}"
+          end
+
+          definition << create_col_string
+
+          first_col = false
+        end
+        definition << ");\n\n"
+      end
+      definition
+    end
+
+    def dump_schema_information
+      begin
+        if (current_schema = ActiveRecord::Migrator.current_version) > 0
+          #TODO: Find a way to get the DB2 instace name to properly form the statement
+          return "INSERT INTO DB2INST2.SCHEMA_INFO (version) VALUES (#{current_schema})"
+        end
+      rescue ActiveRecord::StatementInvalid
+        # No Schema Info
+      end
+    end
+
   end
 end