diff options
Diffstat (limited to 'cli/cache/check.rs')
-rw-r--r-- | cli/cache/check.rs | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/cli/cache/check.rs b/cli/cache/check.rs index c991c14b1..c8b5717ec 100644 --- a/cli/cache/check.rs +++ b/cli/cache/check.rs @@ -7,7 +7,7 @@ use deno_core::error::AnyError; use deno_runtime::deno_webstorage::rusqlite::params; use deno_runtime::deno_webstorage::rusqlite::Connection; -use super::common::run_sqlite_pragma; +use super::common::INITIAL_PRAGMAS; /// The cache used to tell whether type checking should occur again. /// @@ -60,8 +60,7 @@ impl TypeCheckCache { conn: Connection, cli_version: String, ) -> Result<Self, AnyError> { - run_sqlite_pragma(&conn)?; - create_tables(&conn, cli_version)?; + initialize(&conn, cli_version)?; Ok(Self(Some(conn))) } @@ -158,31 +157,24 @@ impl TypeCheckCache { } } -fn create_tables( - conn: &Connection, - cli_version: String, -) -> Result<(), AnyError> { - // INT doesn't store up to u64, so use TEXT - conn.execute( - "CREATE TABLE IF NOT EXISTS checkcache ( - check_hash TEXT PRIMARY KEY - )", - [], - )?; - conn.execute( - "CREATE TABLE IF NOT EXISTS tsbuildinfo ( - specifier TEXT PRIMARY KEY, - text TEXT NOT NULL - )", - [], - )?; - conn.execute( - "CREATE TABLE IF NOT EXISTS info ( - key TEXT PRIMARY KEY, - value TEXT NOT NULL - )", - [], - )?; +fn initialize(conn: &Connection, cli_version: String) -> Result<(), AnyError> { + // INT doesn't store up to u64, so use TEXT for check_hash + let query = format!( + "{INITIAL_PRAGMAS} + CREATE TABLE IF NOT EXISTS checkcache ( + check_hash TEXT PRIMARY KEY + ); + CREATE TABLE IF NOT EXISTS tsbuildinfo ( + specifier TEXT PRIMARY KEY, + text TEXT NOT NULL + ); + CREATE TABLE IF NOT EXISTS info ( + key TEXT PRIMARY KEY, + value TEXT NOT NULL + ); + ", + ); + conn.execute_batch(&query)?; // delete the cache when the CLI version changes let data_cli_version: Option<String> = conn |