aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2015-10-22 08:22:13 +0100
committerAndrew White <pixeltrix@users.noreply.github.com>2015-10-22 08:22:13 +0100
commit94db9b6f1dc0f03b36fda37b7ee914c594105e66 (patch)
tree15faee4ade3d0f2d89104d2cc7cc192b485d36ff /activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
parentd8b076c90efac796e8664c6eada8d08afac4bea3 (diff)
parentedfb738b9c08dbe5ccfd5febf9361d4d3452334a (diff)
downloadrails-94db9b6f1dc0f03b36fda37b7ee914c594105e66.tar.gz
rails-94db9b6f1dc0f03b36fda37b7ee914c594105e66.tar.bz2
rails-94db9b6f1dc0f03b36fda37b7ee914c594105e66.zip
Merge pull request #22011 from kamipo/remove_unused_args_again
Remove `#tables` extra args again
Diffstat (limited to 'activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb')
-rw-r--r--activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 77d99bc116..640df31e2e 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -294,7 +294,7 @@ module ActiveRecord
def test_tables_logs_name
sql = <<-SQL
SELECT name FROM sqlite_master
- WHERE (type = 'table' OR type = 'view') AND NOT name = 'sqlite_sequence'
+ WHERE type IN ('table','view') AND name <> 'sqlite_sequence'
SQL
assert_logged [[sql.squish, 'SCHEMA', []]] do
@conn.tables('hello')
@@ -313,8 +313,7 @@ module ActiveRecord
with_example_table do
sql = <<-SQL
SELECT name FROM sqlite_master
- WHERE (type = 'table' OR type = 'view')
- AND NOT name = 'sqlite_sequence' AND name = \"ex\"
+ WHERE type IN ('table','view') AND name <> 'sqlite_sequence' AND name = 'ex'
SQL
assert_logged [[sql.squish, 'SCHEMA', []]] do
assert @conn.table_exists?('ex')