From 543025f57a8398a37ad4212366d4e1d57cdd02b6 Mon Sep 17 00:00:00 2001 From: Avinash Sajjanshetty Date: Mon, 25 Aug 2025 01:32:41 +0530 Subject: [PATCH] rename encryption PRAGMA key to `hexkey` --- core/pragma.rs | 2 +- parser/src/ast.rs | 7 +++---- tests/integration/query_processing/encryption.rs | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/pragma.rs b/core/pragma.rs index f1a77fa66..0ae48b97a 100644 --- a/core/pragma.rs +++ b/core/pragma.rs @@ -109,7 +109,7 @@ pub fn pragma_for(pragma: &PragmaName) -> Pragma { FreelistCount => Pragma::new(PragmaFlags::Result0, &["freelist_count"]), EncryptionKey => Pragma::new( PragmaFlags::Result0 | PragmaFlags::SchemaReq | PragmaFlags::NoColumns1, - &["key"], + &["hexkey"], ), } } diff --git a/parser/src/ast.rs b/parser/src/ast.rs index 440685014..0c9de857c 100644 --- a/parser/src/ast.rs +++ b/parser/src/ast.rs @@ -1221,10 +1221,9 @@ pub enum PragmaName { IntegrityCheck, /// `journal_mode` pragma JournalMode, - /// encryption key for encrypted databases. This is just called `key` because most - /// extensions use this name instead of `encryption_key`. - #[strum(serialize = "key")] - #[cfg_attr(feature = "serde", serde(rename = "key"))] + /// encryption key for encrypted databases, specified as hexadecimal string. + #[strum(serialize = "hexkey")] + #[cfg_attr(feature = "serde", serde(rename = "hexkey"))] EncryptionKey, /// Noop as per SQLite docs LegacyFileFormat, diff --git a/tests/integration/query_processing/encryption.rs b/tests/integration/query_processing/encryption.rs index c286bde7c..92b43cd20 100644 --- a/tests/integration/query_processing/encryption.rs +++ b/tests/integration/query_processing/encryption.rs @@ -16,7 +16,7 @@ fn test_per_page_encryption() -> anyhow::Result<()> { run_query( &tmp_db, &conn, - "PRAGMA key = 'super secret key for encryption';", + "PRAGMA hexkey = 'super secret key for encryption';", )?; run_query( &tmp_db, @@ -58,7 +58,7 @@ fn test_per_page_encryption() -> anyhow::Result<()> { run_query( &existing_db, &conn, - "PRAGMA key = 'super secret key for encryption';", + "PRAGMA hexkey = 'super secret key for encryption';", )?; run_query_on_row(&existing_db, &conn, "SELECT * FROM test", |row: &Row| { assert_eq!(row.get::(0).unwrap(), 1);