activerecord-jdbc-adapter 1.0.1-java → 1.0.2-java

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.2
+
+- ACTIVERECORD_JDBC-134: Fix conflicting adapter/column superclasses
+- ACTIVERECORD_JDBC-135: Fix regression on PG with boolean and :limit
+- Slew of Derby fixes courtesy of Denis Odorcic
+
 == 1.0.1
 
 - Fix db:test:purge issue affecting all adapters in 1.0.0 due to

data/lib/arjdbc/db2/adapter.rb

@@ -129,11 +129,16 @@ module ArJdbc
     def modify_types(tp)
       tp[:primary_key] = 'int not null generated by default as identity (start with 1) primary key'
       tp[:string][:limit] = 255
-      tp[:integer] = {:limit => nil}
+      tp[:integer][:limit] = nil
       tp[:boolean] = {:name => "smallint"}
       tp
     end
 
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+      limit = nil if type.to_sym == :integer
+      super(type, limit, precision, scale)
+    end
+
     def adapter_name
       'DB2'
     end

data/lib/arjdbc/derby/adapter.rb

@@ -61,10 +61,14 @@ module ::ArJdbc
       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
@@ -72,9 +76,11 @@ module ::ArJdbc
 
     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
 
@@ -82,6 +88,7 @@ module ::ArJdbc
     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
 
@@ -109,14 +116,9 @@ module ::ArJdbc
     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)
@@ -135,42 +137,6 @@ module ::ArJdbc
       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
@@ -192,19 +158,20 @@ module ::ArJdbc
 
 
     def add_column(table_name, column_name, type, options = {})
-      if option_not_null = options[:null] == false
-        option_not_null = options.delete(:null)
+      if option_not_null = (options[:null] == false)
+        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"
+        execute(alter_column_sql)
       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')
@@ -238,22 +205,6 @@ module ::ArJdbc
       sql
     end
 
-    # 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
-    end
-
     SIZEABLE = %w(VARCHAR CLOB BLOB)
 
     def structure_dump #:nodoc:
@@ -298,21 +249,8 @@ module ::ArJdbc
       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:
@@ -328,23 +266,23 @@ module ::ArJdbc
       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;
@@ -354,18 +292,8 @@ module ::ArJdbc
       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)
@@ -386,20 +314,8 @@ module ::ArJdbc
       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

data/lib/arjdbc/discover.rb

@@ -70,7 +70,7 @@ module ::ArJdbc
   end
 
   extension :MsSQL do |name|
-    if name =~ /sqlserver|tds/i
+    if name =~ /sqlserver|tds|Microsoft SQL/i
       require 'arjdbc/mssql'
       true
     end

data/lib/arjdbc/mssql/adapter.rb

@@ -25,7 +25,7 @@ module ::ArJdbc
     end
 
     def self.column_selector
-      [/sqlserver|tds/i, lambda {|cfg,col| col.extend(::ArJdbc::MsSQL::Column)}]
+      [/sqlserver|tds|Microsoft SQL/i, lambda {|cfg,col| col.extend(::ArJdbc::MsSQL::Column)}]
     end
 
     def self.jdbc_connection_class

data/lib/arjdbc/mysql/adapter.rb

@@ -358,6 +358,10 @@ module ::ArJdbc
 end
 
 module ActiveRecord::ConnectionAdapters
+  # Remove any vestiges of core/Ruby MySQL adapter
+  remove_const(:MysqlColumn) if const_defined?(:MysqlColumn)
+  remove_const(:MysqlAdapter) if const_defined?(:MysqlAdapter)
+
   class MysqlColumn < JdbcColumn
     include ArJdbc::MySQL::Column
 

data/lib/arjdbc/postgresql/adapter.rb

@@ -26,6 +26,15 @@ module ::ArJdbc
         end
       end
 
+      def extract_limit(sql_type)
+        case sql_type
+        when /^bigint/i;    8
+        when /^smallint/i;  2
+        when /^bool/i;      nil # ACTIVERECORD_JDBC-135
+        else super
+        end
+      end
+
       def simplified_type(field_type)
         return :integer if field_type =~ /^serial/i
         return :string if field_type =~ /\[\]$/i || field_type =~ /^interval/i
@@ -71,7 +80,7 @@ module ::ArJdbc
       tp[:primary_key] = "serial primary key"
       tp[:string][:limit] = 255
       tp[:integer][:limit] = nil
-      tp[:boolean][:limit] = nil
+      tp[:boolean] = { :name => "boolean" }
       tp[:float] = { :name => "float" }
       tp[:decimal] = { :name => "decimal" }
       tp

data/lib/arjdbc/sqlite3/adapter.rb

@@ -297,6 +297,9 @@ module ::ArJdbc
 end
 
 module ActiveRecord::ConnectionAdapters
+  remove_const(:SQLite3Adapter) if const_defined?(:SQLite3Adapter)
+  remove_const(:SQLiteAdapter) if const_defined?(:SQLiteAdapter)
+
   class SQLite3Column < JdbcColumn
     include ArJdbc::SQLite3::Column
 
@@ -336,13 +339,15 @@ module ActiveRecord::ConnectionAdapters
     end
 
     def jdbc_connection_class(spec)
-      ArJdbc::SQLite3.jdbc_connection_class
+      ::ArJdbc::SQLite3.jdbc_connection_class
     end
 
     def jdbc_column_class
       ActiveRecord::ConnectionAdapters::SQLite3Column
     end
   end
+
+  SQLiteAdapter = SQLite3Adapter
 end
 
 # Fake out sqlite3/version driver for AR tests

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/test/postgres_simple_test.rb

@@ -28,3 +28,24 @@ class PostgresDeserializationTest < Test::Unit::TestCase
     assert_equal expected.sample_float, actual.sample_float
   end
 end
+
+class PostgresSchemaDumperTest < Test::Unit::TestCase
+  def setup
+    DbTypeMigration.up
+    @connection = ActiveRecord::Base.connection
+    strio = StringIO.new
+    ActiveRecord::SchemaDumper::dump(ActiveRecord::Base.connection, strio)
+    @dump = strio.string
+  end
+
+  def teardown
+    DbTypeMigration.down
+  end
+
+  # http://kenai.com/jira/browse/ACTIVERECORD_JDBC-135
+  def test_schema_dump_should_not_have_limits_on_boolean
+    lines = @dump.grep(/boolean/)
+    assert !lines.empty?
+    lines.each {|line| assert line !~ /limit/ }
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 1
-  version: 1.0.1
+    - 2
+  version: 1.0.2
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -05:00
+date: 2010-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
             segments: 
               - 2
               - 6
-              - 1
-            version: 2.6.1
+              - 2
+            version: 2.6.2
     type: :development
     version_requirements: *id002
 description: |-