activerecord-jdbc-adapter 0.9.2 → 1.1.0

data/lib/arjdbc/derby.rb

@@ -0,0 +1,7 @@
+require 'arjdbc/jdbc'
+jdbc_require_driver 'jdbc/derby'
+require 'arjdbc/derby/connection_methods'
+require 'arjdbc/derby/adapter'
+
+
+

data/lib/{jdbc_adapter/jdbc_derby.rb → arjdbc/derby/adapter.rb}

@@ -1,22 +1,9 @@
-require 'jdbc_adapter/missing_functionality_helper'
-
-module ::JdbcSpec
-  module ActiveRecordExtensions
-    def derby_connection(config)
-      require File.dirname(__FILE__) + "/../active_record/connection_adapters/derby_adapter"
-      config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
-      config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
-      embedded_driver(config)
-    end
-  end
+require 'arjdbc/jdbc/missing_functionality_helper'
 
+module ::ArJdbc
   module Derby
-    def self.adapter_matcher(name, *)
-      name =~ /derby/i ? self : false
-    end
-
     def self.column_selector
-      [/derby/i, lambda {|cfg,col| col.extend(::JdbcSpec::Derby::Column)}]
+      [/derby/i, lambda {|cfg,col| col.extend(::ArJdbc::Derby::Column)}]
     end
 
     def self.monkey_rails
@@ -68,12 +55,25 @@ module ::JdbcSpec
       'Derby'
     end
 
-    include JdbcSpec::MissingFunctionalityHelper
+    def arel2_visitors
+      require 'arel/visitors/derby'
+      {'derby' => ::Arel::Visitors::Derby, 'jdbcderby' => ::Arel::Visitors::Derby}
+    end
+
+    include ArJdbc::MissingFunctionalityHelper
+
+    def index_name_length
+      128
+    end
 
-    # Convert the speficied column type to a SQL string.  In Derby, :integers cannot specify
-    # a limit.
+    # Convert the specified column type to a SQL string.
+    # In Derby, the following cannot specify a limit:
+    # - integer
+    # - boolean (smallint)
+    # - timestamp
+    # - date
     def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
-      return super unless type == :integer
+      return super unless [:integer, :boolean, :timestamp, :date].include? type
 
       native = native_database_types[type.to_s.downcase.to_sym]
       native.is_a?(Hash) ? native[:name] : native
@@ -81,16 +81,18 @@ module ::JdbcSpec
 
     def modify_types(tp)
       tp[:primary_key] = "int generated by default as identity NOT NULL PRIMARY KEY"
-      tp[:integer][:limit] = nil
       tp[:string][:limit] = 256
+      tp[:integer][:limit] = nil
       tp[:boolean] = {:name => "smallint"}
+      tp[:timestamp][:limit] = nil
+      tp[:date][:limit] = nil
       tp
     end
 
     # Override default -- fix case where ActiveRecord passes :default => nil, :null => true
     def add_column_options!(sql, options)
       options.delete(:default) if options.has_key?(:default) && options[:default].nil?
-      options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null] == true)
+      sql << " DEFAULT #{quote(options.delete(:default))}" if options.has_key?(:default)
       super
     end
 
@@ -113,23 +115,14 @@ module ::JdbcSpec
       end
     end
 
-    def primary_key(table_name) #:nodoc:
-      primary_keys(table_name).first
-    end
-
     def remove_index(table_name, options) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end
 
     def rename_table(name, new_name)
-      execute "RENAME TABLE #{name} TO #{new_name}"
+      execute "RENAME TABLE #{quote_table_name(name)} TO #{quote_table_name(new_name)}"
     end
 
-    COLUMN_INFO_STMT = "SELECT C.COLUMNNAME, C.REFERENCEID, C.COLUMNNUMBER FROM SYS.SYSCOLUMNS C, SYS.SYSTABLES T WHERE T.TABLEID = '%s' AND T.TABLEID = C.REFERENCEID ORDER BY C.COLUMNNUMBER"
-
-    COLUMN_TYPE_STMT = "SELECT COLUMNDATATYPE, COLUMNDEFAULT FROM SYS.SYSCOLUMNS WHERE REFERENCEID = '%s' AND COLUMNNAME = '%s'"
-
-    AUTO_INC_STMT = "SELECT AUTOINCREMENTSTART, AUTOINCREMENTINC, COLUMNNAME, REFERENCEID, COLUMNDEFAULT FROM SYS.SYSCOLUMNS WHERE REFERENCEID = '%s' AND COLUMNNAME = '%s'"
     AUTO_INC_STMT2 = "SELECT AUTOINCREMENTSTART, AUTOINCREMENTINC, COLUMNNAME, REFERENCEID, COLUMNDEFAULT FROM SYS.SYSCOLUMNS WHERE REFERENCEID = (SELECT T.TABLEID FROM SYS.SYSTABLES T WHERE T.TABLENAME = '%s') AND COLUMNNAME = '%s'"
 
     def add_quotes(name)
@@ -148,42 +141,6 @@ module ::JdbcSpec
       name.gsub(/"/,'""')
     end
 
-    def reinstate_auto_increment(name, refid, coldef)
-      stmt = AUTO_INC_STMT % [refid, strip_quotes(name)]
-      data = execute(stmt).first
-      if data
-        start = data['autoincrementstart']
-        if start
-          coldef << " GENERATED " << (data['columndefault'].nil? ? "ALWAYS" : "BY DEFAULT ")
-          coldef << "AS IDENTITY (START WITH "
-          coldef << start
-          coldef << ", INCREMENT BY "
-          coldef << data['autoincrementinc']
-          coldef << ")"
-          return true
-        end
-      end
-      false
-    end
-
-    def reinstate_auto_increment(name, refid, coldef)
-      stmt = AUTO_INC_STMT % [refid, strip_quotes(name)]
-      data = execute(stmt).first
-      if data
-        start = data['autoincrementstart']
-        if start
-          coldef << " GENERATED " << (data['columndefault'].nil? ? "ALWAYS" : "BY DEFAULT ")
-          coldef << "AS IDENTITY (START WITH "
-          coldef << start
-          coldef << ", INCREMENT BY "
-          coldef << data['autoincrementinc']
-          coldef << ")"
-          return true
-        end
-      end
-      false
-    end
-
     def auto_increment_stmt(tname, cname)
       stmt = AUTO_INC_STMT2 % [tname, strip_quotes(cname)]
       data = execute(stmt).first
@@ -205,19 +162,13 @@ module ::JdbcSpec
 
 
     def add_column(table_name, column_name, type, options = {})
-      if option_not_null = options[:null] == false
-        option_not_null = options.delete(:null)
-      end
       add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       add_column_options!(add_column_sql, options)
       execute(add_column_sql)
-      if option_not_null
-        alter_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} NOT NULL"
-      end
     end
 
     def execute(sql, name = nil)
-      if sql =~ /^\s*(UPDATE|INSERT)/i
+      if sql =~ /\A\s*(UPDATE|INSERT)/i
         i = sql =~ /\swhere\s/im
         if i
           sql[i..-1] = sql[i..-1].gsub(/!=\s*NULL/, 'IS NOT NULL').gsub(/=\sNULL/i, 'IS NULL')
@@ -228,21 +179,27 @@ module ::JdbcSpec
       super
     end
 
+    # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
+    #
+    # Derby requires the ORDER BY columns in the select list for distinct queries, and
+    # requires that the ORDER BY include the distinct column.
+    #
+    #   distinct("posts.id", "posts.created_at desc")
+    #
+    # Based on distinct method for PostgreSQL Adapter
+    def distinct(columns, order_by)
+      return "DISTINCT #{columns}" if order_by.blank?
+
+      # construct a clean list of column names from the ORDER BY clause, removing
+      # any asc/desc modifiers
+      order_columns = order_by.split(',').collect { |s| s.split.first }
+      order_columns.delete_if(&:blank?)
+      order_columns = order_columns.zip((0...order_columns.size).to_a).map { |s,i| "#{s} AS alias_#{i}" }
 
-    # I don't think this method is ever called ??? (stepheneb)
-    def create_column(name, refid, colno)
-      stmt = COLUMN_TYPE_STMT % [refid, strip_quotes(name)]
-      coldef = ""
-      data = execute(stmt).first
-      if data
-        coldef << add_quotes(expand_double_quotes(strip_quotes(name)))
-        coldef << " "
-        coldef << data['columndatatype']
-        if !reinstate_auto_increment(name, refid, coldef) && data['columndefault']
-          coldef << " DEFAULT " << data['columndefault']
-        end
-      end
-      coldef
+      # return a DISTINCT clause that's distinct on the columns we want but includes
+      # all the required columns for the ORDER BY to work properly
+      sql = "DISTINCT #{columns}, #{order_columns * ', '}"
+      sql
     end
 
     SIZEABLE = %w(VARCHAR CLOB BLOB)
@@ -289,21 +246,8 @@ module ::JdbcSpec
       definition
     end
 
-    # Support for removing columns added via derby bug issue:
-    # https://issues.apache.org/jira/browse/DERBY-1489
-    #
-    # This feature has not made it into a formal release and is not in Java 6.
-    # If the normal strategy fails we fall back on a strategy by creating a new
-    # table without the new column and there after moving the data to the new
-    #
     def remove_column(table_name, column_name)
-      begin
-        execute "ALTER TABLE #{table_name} DROP COLUMN #{column_name} RESTRICT"
-      rescue
-        alter_table(table_name) do |definition|
-          definition.columns.delete(definition[column_name])
-        end
-      end
+      execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)} RESTRICT"
     end
 
     # Notes about changing in Derby:
@@ -319,23 +263,23 @@ module ::JdbcSpec
       if options.include?(:null)
         # This seems to only work with 10.2 of Derby
         if options.delete(:null) == false
-          execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} NOT NULL"
+          execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} NOT NULL"
         else
-          execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} NULL"
+          execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} NULL"
         end
       end
 
       # anything left to do?
       unless options.empty?
         begin
-          execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DATA TYPE #{type_to_sql(type, options[:limit])}"
+          execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DATA TYPE #{type_to_sql(type, options[:limit])}"
         rescue
           transaction do
             temp_new_column_name = "#{column_name}_newtype"
             # 1) ALTER TABLE t ADD COLUMN c1_newtype NEWTYPE;
             add_column table_name, temp_new_column_name, type, options
             # 2) UPDATE t SET c1_newtype = c1;
-            execute "UPDATE #{table_name} SET #{temp_new_column_name} = CAST(#{column_name} AS #{type_to_sql(type, options[:limit])})"
+            execute "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(temp_new_column_name)} = CAST(#{quote_column_name(column_name)} AS #{type_to_sql(type, options[:limit])})"
             # 3) ALTER TABLE t DROP COLUMN c1;
             remove_column table_name, column_name
             # 4) ALTER TABLE t RENAME COLUMN c1_newtype to c1;
@@ -345,18 +289,8 @@ module ::JdbcSpec
       end
     end
 
-    # Support for renaming columns:
-    # https://issues.apache.org/jira/browse/DERBY-1490
-    #
-    # This feature is expect to arrive in version 10.3.0.0:
-    # http://wiki.apache.org/db-derby/DerbyTenThreeRelease)
-    #
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
-      begin
-        execute "ALTER TABLE #{table_name} ALTER RENAME COLUMN #{column_name} TO #{new_column_name}"
-      rescue
-        alter_table(table_name, :rename => {column_name => new_column_name})
-      end
+      execute "RENAME COLUMN #{quote_table_name(table_name)}.#{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
     end
 
     def primary_keys(table_name)
@@ -377,20 +311,8 @@ module ::JdbcSpec
       end
     end
 
-    # For DDL it appears you can quote "" column names, but in queries (like insert it errors out?)
     def quote_column_name(name) #:nodoc:
-      name = name.to_s
-      if /^(references|integer|key|group|year)$/i =~ name
-        %Q{"#{name.upcase}"}
-      elsif /[A-Z]/ =~ name && /[a-z]/ =~ name
-        %Q{"#{name}"}
-      elsif name =~ /[\s-]/
-        %Q{"#{name.upcase}"}
-      elsif name =~ /^[_\d]/
-        %Q{"#{name.upcase}"}
-      else
-        name
-      end
+      %Q{"#{name.to_s.upcase.gsub(/"/, '""')}"}
     end
 
     def quoted_true
@@ -414,7 +336,11 @@ module ::JdbcSpec
     private
     # Derby appears to define schemas using the username
     def derby_schema
-      @config[:username].to_s
+      if @config.has_key?(:schema)
+        config[:schema]
+      else
+        (@config[:username] && @config[:username].to_s) || ''
+      end
     end
   end
 end

data/lib/arjdbc/derby/connection_methods.rb

@@ -0,0 +1,18 @@
+module ActiveRecord
+  class Base
+    class << self
+      def derby_connection(config)
+        config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
+        config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
+        conn = embedded_driver(config)
+        md = conn.jdbc_connection.meta_data
+        if md.database_major_version < 10 || (md.database_major_version == 10 && md.database_minor_version < 5)
+          raise ::ActiveRecord::ConnectionFailed, "Derby adapter requires Derby 10.5 or later"
+        end
+        conn
+      end
+
+      alias_method :jdbcderby_connection, :derby_connection
+    end
+  end
+end

data/lib/arjdbc/discover.rb

@@ -0,0 +1,92 @@
+# arjdbc/discover.rb: Declare ArJdbc.extension modules in this file
+# that loads a custom module and adapter.
+
+module ::ArJdbc
+  # Adapters built-in to AR are required up-front so we can override
+  # the native ones
+  require 'arjdbc/mysql'
+  extension :MySQL do |name|
+    name =~ /mysql/i
+  end
+
+  require 'arjdbc/postgresql'
+  extension :PostgreSQL do |name|
+    name =~ /postgre/i
+  end
+
+  require 'arjdbc/sqlite3'
+  extension :SQLite3 do |name|
+    name =~ /sqlite/i
+  end
+
+  # Other adapters are lazy-loaded
+  extension :DB2 do |name, config|
+    if name =~ /(db2|as400)/i && config[:url] !~ /^jdbc:derby:net:/
+      require 'arjdbc/db2'
+      true
+    end
+  end
+
+  extension :Derby do |name|
+    if name =~ /derby/i
+      require 'arjdbc/derby'
+      true
+    end
+  end
+
+  extension :FireBird do |name|
+    if name =~ /firebird/i
+      require 'arjdbc/firebird'
+      true
+    end
+  end
+
+  extension :H2 do |name|
+    if name =~ /\.h2\./i
+      require 'arjdbc/h2'
+      true
+    end
+  end
+
+  extension :HSQLDB do |name|
+    if name =~ /hsqldb/i
+      require 'arjdbc/hsqldb'
+      true
+    end
+  end
+
+  extension :Informix do |name|
+    if name =~ /informix/i
+      require 'arjdbc/informix'
+      true
+    end
+  end
+
+  extension :Mimer do |name|
+    if name =~ /mimer/i
+      require 'arjdbc/mimer'
+      true
+    end
+  end
+
+  extension :MsSQL do |name|
+    if name =~ /sqlserver|tds|Microsoft SQL/i
+      require 'arjdbc/mssql'
+      true
+    end
+  end
+
+  extension :Oracle do |name|
+    if name =~ /oracle/i
+      require 'arjdbc/oracle'
+      true
+    end
+  end
+
+  extension :Sybase do |name|
+    if name =~ /sybase|tds/i
+      require 'arjdbc/sybase'
+      true
+    end
+  end
+end

data/lib/arjdbc/firebird.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/jdbc'
+require 'arjdbc/firebird/adapter'

data/lib/{jdbc_adapter/jdbc_firebird.rb → arjdbc/firebird/adapter.rb}

@@ -1,7 +1,26 @@
-module ::JdbcSpec
+module ::ArJdbc
   module FireBird
-    def self.adapter_matcher(name, *)
-      name =~ /firebird/i ? self : false
+
+    def self.extended(mod)
+      unless @lob_callback_added
+        ActiveRecord::Base.class_eval do
+          def after_save_with_firebird_blob
+            self.class.columns.select { |c| c.sql_type =~ /blob/i }.each do |c|
+              value = self[c.name]
+              value = value.to_yaml if unserializable_attribute?(c.name, c)
+              next if value.nil?
+              connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
+            end
+          end
+        end
+
+        ActiveRecord::Base.after_save :after_save_with_firebird_blob
+        @lob_callback_added = true
+      end
+    end
+
+    def adapter_name
+      'Firebird'
     end
 
     def modify_types(tp)
@@ -10,7 +29,7 @@ module ::JdbcSpec
       tp[:integer][:limit] = nil
       tp
     end
-    
+
     def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) # :nodoc:
       execute(sql, name)
       id_value
@@ -31,11 +50,11 @@ module ::JdbcSpec
     def default_sequence_name(table_name, primary_key) # :nodoc:
       "#{table_name}_seq"
     end
-    
+
     def next_sequence_value(sequence_name)
       select_one("SELECT GEN_ID(#{sequence_name}, 1 ) FROM RDB$DATABASE;")["gen_id"]
     end
-    
+
     def create_table(name, options = {}) #:nodoc:
       super(name, options)
       execute "CREATE GENERATOR #{name}_seq"
@@ -44,7 +63,7 @@ module ::JdbcSpec
     def rename_table(name, new_name) #:nodoc:
       execute "RENAME #{name} TO #{new_name}"
       execute "UPDATE RDB$GENERATORS SET RDB$GENERATOR_NAME='#{new_name}_seq' WHERE RDB$GENERATOR_NAME='#{name}_seq'" rescue nil
-    end  
+    end
 
     def drop_table(name, options = {}) #:nodoc:
       super(name)
@@ -62,10 +81,13 @@ module ::JdbcSpec
     def remove_index(table_name, options) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end
-    
+
     def quote(value, column = nil) # :nodoc:
       return value.quoted_id if value.respond_to?(:quoted_id)
-      
+
+      # BLOBs are updated separately by an after_save trigger.
+      return value.nil? ? "NULL" : "'#{quote_string(value[0..1])}'" if column && [:binary, :text].include?(column.type)
+
       if [Time, DateTime].include?(value.class)
         "CAST('#{value.strftime("%Y-%m-%d %H:%M:%S")}' AS TIMESTAMP)"
       else
@@ -79,27 +101,27 @@ module ::JdbcSpec
     def quote_string(string) # :nodoc:
       string.gsub(/'/, "''")
     end
-    
+
     def quote_column_name(column_name) # :nodoc:
       %Q("#{ar_to_fb_case(column_name)}")
     end
-    
+
     def quoted_true # :nodoc:
       quote(1)
     end
-    
+
     def quoted_false # :nodoc:
       quote(0)
     end
 
     private
-    
+
     # Maps uppercase Firebird column names to lowercase for ActiveRecord;
     # mixed-case columns retain their original case.
     def fb_to_ar_case(column_name)
       column_name =~ /[[:lower:]]/ ? column_name : column_name.to_s.downcase
     end
-    
+
     # Maps lowercase ActiveRecord column names to uppercase for Fierbird;
     # mixed-case columns retain their original case.
     def ar_to_fb_case(column_name)