diff options
author | Yves Senn <yves.senn@gmail.com> | 2014-09-09 11:34:11 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2014-09-09 11:35:17 +0200 |
commit | d2069d60aeb28f74a2be68f0d4a7259a2fc1bfa7 (patch) | |
tree | 85fd521eda28973d255a8a7d178967ddf70765fa /activerecord/test/cases/adapters | |
parent | ae9412e857a78236b359eb1b636511d07fe45cf3 (diff) | |
parent | bbf6df78a42345eb5343337372fb8602b736222e (diff) | |
download | rails-d2069d60aeb28f74a2be68f0d4a7259a2fc1bfa7.tar.gz rails-d2069d60aeb28f74a2be68f0d4a7259a2fc1bfa7.tar.bz2 rails-d2069d60aeb28f74a2be68f0d4a7259a2fc1bfa7.zip |
Merge pull request #14056 from girishso/14041
SQLite3Adapter now checks for views in table_exists? fixes: 14041
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/adapters')
-rw-r--r-- | activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb index b2bf9480dd..8c1c22d3bf 100644 --- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb @@ -297,7 +297,7 @@ module ActiveRecord def test_tables_logs_name sql = <<-SQL SELECT name FROM sqlite_master - WHERE type = 'table' AND NOT name = 'sqlite_sequence' + WHERE (type = 'table' OR type = 'view') AND NOT name = 'sqlite_sequence' SQL assert_logged [[sql.squish, 'SCHEMA', []]] do @conn.tables('hello') @@ -316,7 +316,7 @@ module ActiveRecord with_example_table do sql = <<-SQL SELECT name FROM sqlite_master - WHERE type = 'table' + WHERE (type = 'table' OR type = 'view') AND NOT name = 'sqlite_sequence' AND name = \"ex\" SQL assert_logged [[sql.squish, 'SCHEMA', []]] do |