refactor to use instance methods and be kind to subclasses

rails · Jul 22, 2010 · 97f3c73 · 97f3c73
1 parent 38734af
commit 97f3c73
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
@@ -265,22 +265,23 @@ def loaded?
       def save
         return false unless loaded?
         marshaled_data = self.class.marshal(data)
+        connect        = connection
 
         if @new_record
           @new_record = false
-          @@connection.update <<-end_sql, 'Create session'
+          connect.update <<-end_sql, 'Create session'
-            INSERT INTO #{@@table_name} (
+            INSERT INTO #{table_name} (
-              #{@@connection.quote_column_name(@@session_id_column)},
+              #{connect.quote_column_name(session_id_column)},
-              #{@@connection.quote_column_name(@@data_column)} )
+              #{connect.quote_column_name(data_column)} )
             VALUES (
-              #{@@connection.quote(session_id)},
+              #{connect.quote(session_id)},
-              #{@@connection.quote(marshaled_data)} )
+              #{connect.quote(marshaled_data)} )
           end_sql
         else
-          @@connection.update <<-end_sql, 'Update session'
+          connect.update <<-end_sql, 'Update session'
-            UPDATE #{@@table_name}
+            UPDATE #{table_name}
-            SET #{@@connection.quote_column_name(@@data_column)}=#{@@connection.quote(marshaled_data)}
+            SET #{connect.quote_column_name(data_column)}=#{connect.quote(marshaled_data)}
-            WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
+            WHERE #{connect.quote_column_name(session_id_column)}=#{connect.quote(session_id)}
           end_sql
         end
       end