Merge branch 'master' into set_binds

* master:
  don't establish a new connection when testing with `sqlite3_mem`.
  sqlite >= 3.8.0 supports partial indexes
  Don't try to get the subclass if the inheritance column doesn't exist
  Enum mappings are now exposed via class methods instead of constants.
  Fix fields_for documentation with index option [ci skip]
  quick pass through Active Record CHANGELOG. [ci skip]
  [ci skip] Grammar correction
  single quotes for controller generated routes
  [ci skip] Added alias to CSRF
  Set NameError#name

1 files changed, 21 insertions, 15 deletions

diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index b82dd7b04b..a49432b4a8 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -34,24 +34,30 @@ module ActiveRecord
       end
 
       def test_connect_with_url
-        original_connection = ActiveRecord::Base.remove_connection
-        tf = Tempfile.open 'whatever'
-        url = "sqlite3://#{tf.path}"
-        ActiveRecord::Base.establish_connection(url)
-        assert ActiveRecord::Base.connection
-      ensure
-        tf.close
-        tf.unlink
-        ActiveRecord::Base.establish_connection(original_connection)
+        skip "can't establish new connection when using memory db" if in_memory_db?
+        begin
+          original_connection = ActiveRecord::Base.remove_connection
+          tf = Tempfile.open 'whatever'
+          url = "sqlite3://#{tf.path}"
+          ActiveRecord::Base.establish_connection(url)
+          assert ActiveRecord::Base.connection
+        ensure
+          tf.close
+          tf.unlink
+          ActiveRecord::Base.establish_connection(original_connection)
+        end
       end
 
       def test_connect_memory_with_url
-        original_connection = ActiveRecord::Base.remove_connection
-        url = "sqlite3:///:memory:"
-        ActiveRecord::Base.establish_connection(url)
-        assert ActiveRecord::Base.connection
-      ensure
-        ActiveRecord::Base.establish_connection(original_connection)
+        skip "can't establish new connection when using memory db" if in_memory_db?
+        begin
+          original_connection = ActiveRecord::Base.remove_connection
+          url = "sqlite3:///:memory:"
+          ActiveRecord::Base.establish_connection(url)
+          assert ActiveRecord::Base.connection
+        ensure
+          ActiveRecord::Base.establish_connection(original_connection)
+        end
       end
 
       def test_valid_column