Permalink
Browse files

Complete change of `sqlite3:///` path handling

That which was now relative is now absolute.
  • Loading branch information...
1 parent f846828 commit 0a99fddc140d8aa54a8922e745624a250877658b @matthewd matthewd committed Apr 2, 2014
@@ -1,3 +1,11 @@
+* As promised, switch `sqlite3:///` URLs (which were temporarily
+ deprecated in 4.1) from relative to absolute.
+
+ If you still want the previous interpretation, you should replace
+ `sqlite3:///my/path` with `sqlite3:my/path`.
+
+ *Matthew Draper*
+
* (Temporarily) deprecate SQLite database URLs containing an
authority.
@@ -41,7 +41,6 @@ def initialize(url)
else
@query = @uri.query
end
- @authority = url =~ %r{\A[^:]*://}
end
# Converts the given URL to a full connection hash.
@@ -91,21 +90,8 @@ def raw_config
end
# Returns name of the database.
- # Sqlite3's handling of a leading slash is in transition as of
- # Rails 4.1.
def database_from_path
- if @authority && @adapter == 'sqlite3'
- # 'sqlite3:///foo' is relative, for backwards compatibility.
-
- database_name = uri.path.sub(%r{^/}, "")
-
- msg = "Paths in SQLite3 database URLs of the form `sqlite3:///path` will be treated as absolute in Rails 4.2. " \
- "Please switch to `sqlite3:#{database_name}`."
- ActiveSupport::Deprecation.warn(msg)
-
- database_name
-
- elsif @adapter == 'sqlite3'
+ if @adapter == 'sqlite3'
# 'sqlite3:/foo' is absolute, because that makes sense. The
# corresponding relative version, 'sqlite3:foo', is handled
# elsewhere, as an "opaque".
@@ -83,8 +83,8 @@ def test_encoded_password
end
def test_url_with_authority_for_sqlite3
- spec = assert_deprecated { resolve 'sqlite3:///foo_test' }
- assert_equal('foo_test', spec["database"])
+ spec = resolve 'sqlite3:///foo_test'
+ assert_equal('/foo_test', spec["database"])
end
def test_url_absolute_path_for_sqlite3

0 comments on commit 0a99fdd

Please sign in to comment.