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/lib/active_record | |
| 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/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 5eb9385a47..ebb311df57 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -373,7 +373,7 @@ module ActiveRecord 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 sql << " AND name = #{quote_table_name(table_name)}" if table_name |