fix application_id

Author: mlin

src/zstd_vfs.h

@@ -374,7 +374,8 @@ class ZstdVFS : public SQLiteNested::VFS {
         SQLiteNested::VFS::InitOuterDB(db);
         std::vector<const char *> ddl = {
             "CREATE TABLE nested_vfs_zstd_dicts (id INTEGER PRIMARY KEY AUTOINCREMENT, dict BLOB "
-            "NOT NULL, page_count INTEGER NOT NULL); PRAGMA application_id=0x7a737464"};
+            "NOT NULL, page_count INTEGER NOT NULL)",
+            "PRAGMA application_id=0x7a737464"};
         for (const auto &stmt : ddl) {
             SQLite::Statement(db, stmt).executeStep();
         }

test/TPC-H.py

@@ -148,6 +148,10 @@ def run(cache_MiB, level, threads, inner_page_KiB, outer_page_KiB):
         con.close()
         assert results == expected_results[query_name]
 
+    # verify outer application_id
+    outer = sqlite3.connect("/tmp/TPC-H.zstd.db")
+    assert next(outer.execute("PRAGMA application_id"))[0] == 0x7A737464
+
     return timings
 
 

test/test.py

@@ -138,6 +138,10 @@ def test_roundtrip_zstd(tmpdir, chinook_file):
     linkcon = sqlite3.connect(f"file:{linkpath}?vfs=zstd", uri=True)
     linkcon.execute("select 1")
 
+    # verify application_id
+    outer = sqlite3.connect(dbfn)
+    assert next(outer.execute("PRAGMA application_id"))[0] == 0x7A737464
+
 
 @pytest.mark.skipif(os.geteuid() != 0, reason="must run in docker")
 def test_db_in_root():
@@ -160,6 +164,10 @@ def test_vacuum(tmpdir, chinook_file):
     dbfn = os.path.join(tmpdir, "chinook_zstd_vacuum.sqlite")
     con.execute(f"VACUUM INTO 'file:{dbfn}?vfs=zstd'")
 
+    # verify application_id
+    outer = sqlite3.connect(dbfn)
+    assert next(outer.execute("PRAGMA application_id"))[0] == 0x7A737464
+
     # dump from the zstd version
     rslt = subprocess.run(
         f"sqlite3 :memory: -bail -cmd '.load {os.path.join(BUILD,'zstd_vfs')}' -cmd '.open file:{dbfn}?mode=ro&vfs=zstd' -cmd .dump -cmd .exit",
@@ -252,9 +260,10 @@ def test_sam(tmpdir):
     ratio = float(zstd_sqlite_size) / sam_zst_size
     assert ratio <= 1.6
 
-    # verify outer page size
+    # verify outer page size and application_id
     con = sqlite3.connect(f"file:{zstd_sqlite}?mode=ro", uri=True)
     assert next(con.execute("PRAGMA page_size"))[0] == outer_page_size
+    assert next(con.execute("PRAGMA application_id"))[0] == 0x7A737464
 
     # verify inner page size
     con.enable_load_extension(True)