eliminate #do_exec helper - adapters should override exec_xxx methods

Author: kares

lib/arjdbc/jdbc/adapter.rb

@@ -234,47 +234,30 @@ def jdbc_columns(table_name, name = nil)
       # +binds+ as the bind substitutes.  +name+ is logged along with
       # the executed +sql+ statement.
       def exec_query(sql, name = 'SQL', binds = []) # :nodoc:
-        do_exec(sql, name, binds, :query)
+        log(sql, name || 'SQL') { @connection.execute_query(to_sql(sql, binds)) }
       end
 
       # Executes insert +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is the logged along with
       # the executed +sql+ statement.
       def exec_insert(sql, name, binds, pk = nil, sequence_name = nil) # :nodoc:
-        do_exec(sql, name, binds, :insert)
+        log(sql, name || 'SQL') { @connection.execute_insert(to_sql(sql, binds)) }
       end
 
       # Executes delete +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is the logged along with
       # the executed +sql+ statement.
       def exec_delete(sql, name, binds) # :nodoc:
-        do_exec(sql, name, binds, :delete)
+        log(sql, name || 'SQL') { @connection.execute_delete(to_sql(sql, binds)) }
       end
 
       # Executes update +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is the logged along with
       # the executed +sql+ statement.
       def exec_update(sql, name, binds) # :nodoc:
-        do_exec(sql, name, binds, :update)
+        log(sql, name || 'SQL') { @connection.execute_update(to_sql(sql, binds)) }
       end
 
-      # TODO is it really useful to have do_exec now ?!
-      def do_exec(sql, name, binds, type)
-        sql = to_sql(sql, binds)
-        log(sql, name || 'SQL') do
-          if type == :insert
-            @connection.execute_insert(sql)
-          elsif type == :update
-            @connection.execute_update(sql)
-          elsif type == :delete
-            @connection.execute_delete(sql)
-          else # type == :query
-            @connection.execute_query(sql)
-          end
-        end
-      end
-      protected :do_exec
-      
       # Similar to {#exec_query} except it returns "raw" results in an array
       # where each rows is a hash with keys as columns (just like Rails used to 
       # do up until 3.0) instead of wrapping them in a {#ActiveRecord::Result}.
@@ -283,7 +266,6 @@ def exec_query_raw(sql, name = 'SQL', binds = [], &block) # :nodoc:
           @connection.execute_query_raw(to_sql(sql, binds), &block)
         end
       end
-      alias_method :exec_raw_query, :exec_query_raw
 
       def select_rows(sql, name = nil)
         exec_query_raw(sql, name).map!(&:values)

lib/arjdbc/mssql/adapter.rb

@@ -596,17 +596,12 @@ def exec_proc(proc_name, *variables)
     end
     alias_method :execute_procedure, :exec_proc # AR-SQLServer-Adapter naming
 
-    protected
-    
-    # NOTE: we allow to execute the SQL as explicitly requested by this,
-    # {#exec_query} won't route to {#_execute} and analyze if it's a select 
-    # e.g. this allows to use SQLServer's EXEC with a result set ...
-    def do_exec(sql, name, binds, type)
-      if type == :query # exec_query
-        sql = repair_special_columns to_sql(sql, binds)
-        log(sql, name || 'SQL') { @connection.execute_query sql }
-      else super
-      end
+    # @override
+    def exec_query(sql, name = 'SQL', binds = []) # :nodoc:
+      # NOTE: we allow to execute SQL as requested returning a results.
+      # e.g. this allows to use SQLServer's EXEC with a result set ...
+      sql = repair_special_columns to_sql(sql, binds)
+      log(sql, name || 'SQL') { @connection.execute_query(sql) }
     end
 
     private

lib/arjdbc/sqlite3/adapter.rb

@@ -294,7 +294,7 @@ def select(sql, name = nil, binds = [])
       result
     end
 
-    # #override as {#execute_insert} not implemented by SQLite JDBC driver
+    # @override as <code>execute_insert</code> not implemented by SQLite JDBC
     def exec_insert(sql, name, binds, pk = nil, sequence_name = nil) # :nodoc:
       execute(sql, name, binds)
     end