Title: [503] trunk/activerecord-jdbc/lib: Make execute use _execute directly, and modules 'overriding' execute defines _execute instead.
- Revision
- 503
- Author
- olabini
- Date
- 2007-04-25 14:41:07 -0400 (Wed, 25 Apr 2007)
Log Message
Make execute use _execute directly, and modules 'overriding' execute defines _execute instead. The reason for this is the fact that Rails test cases are stupid.
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb (502 => 503)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2007-04-25 18:23:00 UTC (rev 502)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2007-04-25 18:41:07 UTC (rev 503)
@@ -397,6 +397,13 @@
end
def execute(sql, name = nil)
+ _execute(sql,name)
+ end
+
+ # we need to do it this way, to allow Rails stupid tests to always work
+ # even if we define a new execute method. Instead of mixing in a new
+ # execute, an _execute should be mixed in.
+ def _execute(sql, name = nil)
log_no_bench(sql, name) do
case sql.strip
when /^(select|show)/i:
@@ -408,7 +415,7 @@
end
end
end
-
+
def update(sql, name = nil) #:nodoc:
execute(sql, name)
end
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_derby.rb (502 => 503)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_derby.rb 2007-04-25 18:23:00 UTC (rev 502)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_derby.rb 2007-04-25 18:41:07 UTC (rev 503)
@@ -79,7 +79,7 @@
end
end
- def execute(sql, name = nil)
+ def _execute(sql, name = nil)
log_no_bench(sql, name) do
if sql.strip =~ /^(select|show)/i
@offset ||= 0
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb (502 => 503)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb 2007-04-25 18:23:00 UTC (rev 502)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb 2007-04-25 18:41:07 UTC (rev 503)
@@ -109,7 +109,7 @@
@limit = @offset = nil
end
- def execute(sql, name = nil)
+ def _execute(sql, name = nil)
log_no_bench(sql, name) do
if sql =~ /^select/i
@offset ||= 0
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
