Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb (606 => 607)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2007-05-25 04:57:38 UTC (rev 606)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2007-05-31 14:42:49 UTC (rev 607)
@@ -94,14 +94,16 @@
lambda {|r| r['type_name'] =~ /^real$/i},
lambda {|r| r['precision'] == '15'}],
: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'] =~ /^datetime$/i},
+ lambda {|r| r['type_name'] =~ /^timestamp$/i},
+ lambda {|r| r['type_name'] =~ /^date/i}],
: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'] =~ /^datetime/i},
+ lambda {|r| r['type_name'] =~ /^date/i}],
:time => [ lambda {|r| Jdbc::Types::TIME == r['data_type'].to_i},
lambda {|r| r['type_name'] =~ /^time$/i},
- lambda {|r| r['type_name'] =~ /^datetime$/i}],
+ lambda {|r| r['type_name'] =~ /^date/i}],
:date => [ lambda {|r| Jdbc::Types::DATE == r['data_type'].to_i},
lambda {|r| r['type_name'] =~ /^date$/i}],
:binary => [ lambda {|r| [Jdbc::Types::LONGVARBINARY,Jdbc::Types::BINARY,Jdbc::Types::BLOB].include?(r['data_type'].to_i)},
Modified: trunk/activerecord-jdbc/pom.xml (606 => 607)
--- trunk/activerecord-jdbc/pom.xml 2007-05-25 04:57:38 UTC (rev 606)
+++ trunk/activerecord-jdbc/pom.xml 2007-05-31 14:42:49 UTC (rev 607)
@@ -4,13 +4,13 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>shared</artifactId>
- <version>1.0.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jruby.testsuites</groupId>
<artifactId>activerecord-jdbc</artifactId>
<packaging>jar</packaging>
- <version>1.0.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
<name>JRuby ActiveRecord-JDBC testsuite</name>
<description>Test ActiveRecord-JDBC</description>
@@ -86,6 +86,11 @@
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
</dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504.jdbc4</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
