Title: [530] trunk/activerecord-jdbc: Fix the prepared statements problem for now
- Revision
- 530
- Author
- olabini
- Date
- 2007-05-02 14:28:22 -0400 (Wed, 02 May 2007)
Log Message
Fix the prepared statements problem for now
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb (529 => 530)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb 2007-05-02 15:21:43 UTC (rev 529)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb 2007-05-02 18:28:22 UTC (rev 530)
@@ -69,7 +69,7 @@
elsif id_value # Pre-assigned id
log(sql, name) { @connection.execute_insert sql,pk }
else # Assume the sql contains a bind-variable for the id
- id_value = select_one("select #{sequence_name}.nextval id from dual")['id']
+ id_value = select_one("select #{sequence_name}.nextval id from dual")['id'].to_i
log(sql, name) {
execute_prepared_insert(sql,id_value)
}
Modified: trunk/activerecord-jdbc/src/java/JdbcAdapterInternalService.java (529 => 530)
--- trunk/activerecord-jdbc/src/java/JdbcAdapterInternalService.java 2007-05-02 15:21:43 UTC (rev 529)
+++ trunk/activerecord-jdbc/src/java/JdbcAdapterInternalService.java 2007-05-02 18:28:22 UTC (rev 530)
@@ -313,9 +313,8 @@
return runtime.newArray(keyNames);
}
- public static IRubyObject prepareStatement(IRubyObject recv, IRubyObject sql) throws SQLException {
- Connection c = (Connection)recv.dataGetStruct();
- return JavaObject.wrap(recv.getRuntime(), c.prepareStatement(sql.toString()));
+ public static IRubyObject prepareStatement(IRubyObject recv, IRubyObject sql) {
+ return recv.getInstanceVariable("@connection").callMethod(recv.getRuntime().getCurrentContext(),"prepareStatement",sql);
}
public static IRubyObject execute_update(IRubyObject recv, IRubyObject sql) throws SQLException {
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
