Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_db2.rb (988 => 989)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_db2.rb 2008-05-13 20:41:41 UTC (rev 988)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_db2.rb 2008-05-13 20:54:21 UTC (rev 989)
@@ -17,14 +17,14 @@
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 @@
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 @@
tp[:boolean][:limit] = nil
tp
end
-
+
def add_limit_offset!(sql, options)
if limit = options[:limit]
offset = options[:offset] || 0
@@ -66,7 +66,7 @@
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 @@
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 @@
else super
end
end
-
+
def quote_string(string)
string.gsub(/'/, "''") # ' (for ruby-mode)
end
@@ -100,5 +100,94 @@
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
Modified: trunk/activerecord-jdbc/test/db2_simple_test.rb (988 => 989)
--- trunk/activerecord-jdbc/test/db2_simple_test.rb 2008-05-13 20:41:41 UTC (rev 988)
+++ trunk/activerecord-jdbc/test/db2_simple_test.rb 2008-05-13 20:54:21 UTC (rev 989)
@@ -4,3 +4,7 @@
class DB2SimpleTest < Test::Unit::TestCase
include SimpleTestMethods
end
+
+class DB2HasManyThroughTest < Test::Unit::TestCase
+ include HasManyThroughMethods
+end
