Title: [904] trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb: Fix for Rubyforge #11567 (Matt Williams)
Revision
904
Author
nicksieger
Date
2008-02-13 15:06:32 -0500 (Wed, 13 Feb 2008)

Log Message

Fix for Rubyforge #11567 (Matt Williams)

Modified Paths


Diff

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb (903 => 904)


--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb	2008-02-12 19:08:50 UTC (rev 903)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb	2008-02-13 20:06:32 UTC (rev 904)
@@ -157,6 +157,17 @@
       Integer(select_value("SELECT IDENTITY() FROM #{table}"))
     end
 
+    # Override normal #_execute: See Rubyforge #11567
+    def _execute(sql, name = nil)
+      if ::ActiveRecord::ConnectionAdapters::JdbcConnection::select?(sql)
+        @connection.execute_query(sql)
+      elsif ::ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql)
+        insert(sql, name)
+      else
+        @connection.execute_update(sql)
+      end
+    end
+
     def add_limit_offset!(sql, options) #:nodoc:
       offset = options[:offset] || 0
       bef = sql[7..-1]
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel

Reply via email to