Merge pull request #132 from Mytherin/issue121

Fix #121: pass schema into CreateViewInfo::FromCreateView

Author: Mytherin

src/storage/sqlite_transaction.cpp

@@ -135,16 +135,15 @@ optional_ptr<CatalogEntry> SQLiteTransaction::GetCatalogEntry(const string &entr
 		string sql;
 		db->GetViewInfo(entry_name, sql);
 
-
 		unique_ptr<CreateViewInfo> view_info;
 		try {
-			view_info = CreateViewInfo::FromCreateView(*context.lock(), sql);
+			view_info = CreateViewInfo::FromCreateView(*context.lock(), sqlite_catalog.GetMainSchema(), sql);
 		} catch(std::exception &ex) {
 			auto view_sql = ExtractSelectStatement(sql);
 			auto catalog_name = StringUtil::Replace(sqlite_catalog.GetName(), "\"", "\"\"");
 			auto escaped_view_sql = StringUtil::Replace(view_sql, "'", "''");
 			auto view_def = StringUtil::Format("CREATE VIEW %s AS FROM sqlite_query(\"%s\", '%s')", entry_name, catalog_name, escaped_view_sql);
-			view_info = CreateViewInfo::FromCreateView(*context.lock(), view_def);
+			view_info = CreateViewInfo::FromCreateView(*context.lock(), sqlite_catalog.GetMainSchema(), view_def);
 		}
 		view_info->internal = false;
 		result = make_uniq<ViewCatalogEntry>(sqlite_catalog, sqlite_catalog.GetMainSchema(), *view_info);

test/sql/storage/attach_describe.test

@@ -16,6 +16,12 @@ DESCRIBE s1.test
 i	BIGINT	YES	PRI	NULL	NULL
 j	BIGINT	YES	NULL	42	NULL
 
+query IIIIII
+DESCRIBE TABLE s1.test
+----
+i	BIGINT	YES	PRI	NULL	NULL
+j	BIGINT	YES	NULL	42	NULL
+
 query ITTTTT
 PRAGMA table_info('s1.test');
 ----

test/sql/storage/attach_show_tables.test

@@ -0,0 +1,11 @@
+# name: test/sql/storage/attach_show_tables.test
+# description:
+# group: [sqlite_storage]
+
+require sqlite_scanner
+
+statement ok
+ATTACH 'data/db/sakila.db' AS sakila (TYPE SQLITE, READ_ONLY)
+
+statement ok
+SHOW TABLES