aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2015-04-22 14:44:04 -0400
committerAndrew White <andyw@pixeltrix.co.uk>2015-04-22 14:47:13 -0400
commit688c0ec26454c9ab64d8d11fc689a3fe9ab5924f (patch)
treef710d8a8a070a6e5de329f6cfbb2b87cc641205c /railties
parent7196372a8ea01329fd49c5e71d392385f2b2e7e6 (diff)
downloadrails-688c0ec26454c9ab64d8d11fc689a3fe9ab5924f.tar.gz
rails-688c0ec26454c9ab64d8d11fc689a3fe9ab5924f.tar.bz2
rails-688c0ec26454c9ab64d8d11fc689a3fe9ab5924f.zip
Remove sqlite support from `rails dbconsole`
Support for versions of SQLite less than 3 was removed in #6011 as part of the Rails 4.0 release. Therefore there is no need to have support for it in the `rails dbconsole` command anymore.
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/lib/rails/commands/dbconsole.rb3
-rw-r--r--railties/test/commands/dbconsole_test.rb6
3 files changed, 4 insertions, 9 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ff9694b6ca..43eee9f442 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove sqlite support from `rails dbconsole`.
+
+ *Andrew White*
+
* Rename `railties/bin` to `railties/exe` to match the new Bundler executables
convention.
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 5701ffd104..3b22b582cf 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -50,9 +50,6 @@ module Rails
ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && options['include_password']
find_cmd_and_exec('psql', config["database"])
- when "sqlite"
- find_cmd_and_exec('sqlite', config["database"])
-
when "sqlite3"
args = []
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index a3cd1eb0ed..2e8dd99f36 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -158,12 +158,6 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
assert_equal 'q1w2e3', ENV['PGPASSWORD']
end
- def test_sqlite
- start(adapter: 'sqlite', database: 'db')
- assert !aborted
- assert_equal ['sqlite', 'db'], dbconsole.find_cmd_and_exec_args
- end
-
def test_sqlite3
start(adapter: 'sqlite3', database: 'db.sqlite3')
assert !aborted