Speed up and simplify query caching.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7498 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 3 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb b/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
index c43e9435b4..d8ff88b287 100644
--- a/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
@@ -176,7 +176,7 @@ module ActiveRecord
         30
       end
 
-      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
         begin
           table_name = get_table_name(sql)
           col = get_identity_column(table_name)
@@ -194,9 +194,7 @@ module ActiveRecord
           end
 
           log(sql, name) do
-            execute(sql, name)
-            ident = select_one("SELECT @@IDENTITY AS last_id")["last_id"]
-            id_value || ident
+            super || select_value("SELECT @@IDENTITY AS last_id")
           end
         ensure
           if ii_enabled
@@ -219,7 +217,7 @@ module ActiveRecord
       def rollback_db_transaction() raw_execute "ROLLBACK TRAN" end
 
       def current_database
-        select_one("select DB_NAME() as name")["name"]
+        select_value("select DB_NAME() as name")
       end
 
       def tables(name = nil)