ActiveRecord-JDBC 0.3 → 0.3.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.1
+
+* Derby critical fixes shortly after 0.3
+
 == 0.3
 
 * Release coincides with JRuby 1.0.0RC1 release

data/Rakefile

@@ -84,7 +84,7 @@ begin
   Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
 
   require 'hoe'
-  Hoe.new("ActiveRecord-JDBC", "0.3") do |p|
+  Hoe.new("ActiveRecord-JDBC", "0.3.1") do |p|
     p.rubyforge_name = "jruby-extras"
     p.url = "http://jruby-extras.rubyforge.org/ActiveRecord-JDBC"
     p.author = "Nick Sieger, Ola Bini and JRuby contributors"

data/lib/jdbc_adapter/jdbc_db2.rb

@@ -24,7 +24,7 @@ module JdbcSpec
         return value if value.is_a? Time
         time_array = ParseDate.parsedate value
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end
 
       def guess_date_or_time(value)

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -27,7 +27,7 @@ module JdbcSpec
         return value if value.is_a? Time
         time_array = ParseDate.parsedate value
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end
 
       def guess_date_or_time(value)
@@ -119,7 +119,88 @@ module JdbcSpec
     def rename_table(name, new_name)
       execute "RENAME TABLE #{name} TO #{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'"
+
+
+    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 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 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
+    
+    def structure_dump #:nodoc:
+      data = ""
+      execute("select tablename, tableid from sys.systables where schemaid not in (select schemaid from sys.sysschemas where schemaname LIKE 'SYS%')").each do |tbl|
+        tid = tbl["tableid"]
+        tname = tbl["tablename"]
+        data << "CREATE TABLE #{tname} (\n"
+        first_col = true
+        execute(COLUMN_INFO_STMT % tid).each do |col|
+          col_name = add_quotes(col['columnname']);
+          create_col_string = create_column(col_name, col['referenceid'],col['columnnumber'].to_i)
+          if !first_col
+            create_col_string = ",\n #{create_col_string}"
+          else
+            create_col_string = " #{create_col_string}"
+          end
+
+          data << create_col_string
+
+          first_col = false
+        end
+        data << ");\n\n"
+      end
+      data
+    end
+    
     # Support for removing columns added via derby bug issue:
     # https://issues.apache.org/jira/browse/DERBY-1489
     #
@@ -184,6 +265,12 @@ module JdbcSpec
     def primary_keys(table_name)
       @connection.primary_keys table_name.to_s.upcase
     end
+
+    def recreate_database(db_name)
+      tables.each do |t|
+        drop_table t rescue nil
+      end
+    end    
     
     # For migrations, exclude the primary key index as recommended
     # by the HSQLDB docs.  This is not a great test for primary key
@@ -212,12 +299,7 @@ module JdbcSpec
             end
           end
         else
-          vi = value.to_i
-          if vi.to_s == value
-            value
-          else
-            "'#{quote_string(value)}'"
-          end
+          super
         end
       else super
       end

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -25,7 +25,7 @@ module JdbcSpec
         return value if value.is_a? Time
         time_array = ParseDate.parsedate value
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end
 
       def guess_date_or_time(value)

data/lib/jdbc_adapter/jdbc_mssql.rb

@@ -38,7 +38,7 @@ module JdbcSpec
         time_array[0] ||= 2000
         time_array[1] ||= 1
         time_array[2] ||= 1
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end
 
       def cast_to_datetime(value)

data/lib/jdbc_adapter/jdbc_oracle.rb

@@ -35,7 +35,7 @@ module JdbcSpec
         return value if value.is_a? Time
         time_array = ParseDate.parsedate value
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end
 
       def guess_date_or_time(value)
@@ -111,31 +111,6 @@ module JdbcSpec
       select_one("select sys_context('userenv','db_name') db from dual")["db"]
     end
 
-    def indexes(table_name, name = nil) #:nodoc:
-      result = select_all(<<-SQL, name)
-      SELECT lower(i.index_name) as index_name, i.uniqueness, lower(c.column_name) as column_name
-      FROM user_indexes i, user_ind_columns c
-      WHERE i.table_name = '#{table_name.to_s.upcase}'
-      AND c.index_name = i.index_name
-      AND i.index_name NOT IN (SELECT index_name FROM user_constraints WHERE constraint_type = 'P')
-      ORDER BY i.index_name, c.column_position
-      SQL
-
-      current_index = nil
-      indexes = []
-
-      result.each do |row|
-        if current_index != row['index_name']
-          indexes << IndexDefinition.new(table_name, row['index_name'], row['uniqueness'] == "UNIQUE", [])
-          current_index = row['index_name']
-        end
-
-        indexes.last.columns << row['column_name']
-      end
-
-      indexes
-    end
-
     def remove_index(table_name, options = {}) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -16,7 +16,7 @@ module JdbcSpec
         return value if value.is_a? Time
         time_array = ParseDate.parsedate value
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end
 
       def guess_date_or_time(value)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ActiveRecord-JDBC
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 date: 2007-05-07 00:00:00 -05:00
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 require_paths: