Merge pull request #14056 from girishso/14041

SQLite3Adapter now checks for views in table_exists? fixes: 14041

Conflicts:
	activerecord/CHANGELOG.md

2 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 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
diff --git a/activerecord/test/cases/view_test.rb b/activerecord/test/cases/view_test.rb
index aef6ad2296..b79dd03676 100644
--- a/activerecord/test/cases/view_test.rb
+++ b/activerecord/test/cases/view_test.rb
@@ -28,7 +28,6 @@ class ViewWithPrimaryKeyTest < ActiveRecord::TestCase
   end
 
   def test_table_exists
-    skip "SQLite does not currently treat views as tables" if current_adapter?(:SQLite3Adapter)
     view_name = Ebook.table_name
     assert @connection.table_exists?(view_name), "'#{view_name}' table should exist"
   end