starting sql bypass test, fixing create_table and drop_table!

2 files changed, 26 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index feb9e2e8f6..cc8d697dde 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -217,17 +217,17 @@ module ActiveRecord
         end
 
         def create_table!
-          @@connection.execute <<-end_sql
+          connection.execute <<-end_sql
             CREATE TABLE #{table_name} (
               id INTEGER PRIMARY KEY,
-              #{@@connection.quote_column_name(session_id_column)} TEXT UNIQUE,
-              #{@@connection.quote_column_name(data_column)} TEXT
+              #{connection.quote_column_name(session_id_column)} TEXT UNIQUE,
+              #{connection.quote_column_name(data_column)} TEXT
             )
           end_sql
         end
 
         def drop_table!
-          @@connection.execute "DROP TABLE #{table_name}"
+          connection.execute "DROP TABLE #{table_name}"
         end
       end
 
diff --git a/activerecord/test/cases/session_store/sql_bypass.rb b/activerecord/test/cases/session_store/sql_bypass.rb
new file mode 100644
index 0000000000..5484c34f7d
--- /dev/null
+++ b/activerecord/test/cases/session_store/sql_bypass.rb
@@ -0,0 +1,22 @@
+require 'cases/helper'
+require 'action_dispatch'
+require 'active_record/session_store'
+
+module ActiveRecord
+  class SessionStore
+    class SqlBypassTest < ActiveRecord::TestCase
+      def setup
+        super
+        Session.drop_table! if Session.table_exists?
+      end
+
+      def test_create_table
+        assert !Session.table_exists?
+        SqlBypass.create_table!
+        assert Session.table_exists?
+        SqlBypass.drop_table!
+        assert !Session.table_exists?
+      end
+    end
+  end
+end