@stacksjs/database 0.70.366 → 0.70.367

package/dist/auth-tables.js

@@ -1,4 +1,4 @@
-import process from"node:process";import{randomBytes}from"node:crypto";import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";import{indexSqlForDialect}from"./dialect";function getDbDriver(){return envVars.DB_CONNECTION||"sqlite"}export function usersEmailVerifiedAtSql(sql){return`ALTER TABLE users ADD COLUMN email_verified_at ${sql.nullableTimestamp}`}export function usersPasswordChangedAtSql(sql){return`ALTER TABLE users ADD COLUMN password_changed_at ${sql.nullableTimestamp}`}export function usersTwoFactorColumnsSql(sql){return["ALTER TABLE users ADD COLUMN two_factor_secret VARCHAR(255)",`ALTER TABLE users ADD COLUMN two_factor_enabled BOOLEAN NOT NULL DEFAULT ${sql.boolFalse}`,"ALTER TABLE users ADD COLUMN two_factor_last_used_step BIGINT"]}export function usersStripeIdSql(){return"ALTER TABLE users ADD COLUMN stripe_id VARCHAR(255)"}export function oauthAccessTokenDeviceColumnsSql(){return["ALTER TABLE oauth_access_tokens ADD COLUMN user_agent VARCHAR(255)","ALTER TABLE oauth_access_tokens ADD COLUMN ip_address VARCHAR(45)"]}export function passwordResetsExpiresAtSql(){return["ALTER TABLE password_resets ADD COLUMN expires_at TIMESTAMP"]}export async function ensureUsersAuthColumns(sql,options={}){const alters=[usersEmailVerifiedAtSql(sql),usersPasswordChangedAtSql(sql),...usersTwoFactorColumnsSql(sql),usersStripeIdSql()];for(const alterSql of alters)try{await db.unsafe(alterSql).execute()}catch{if(options.verbose)log.debug(`[auth-tables] Skipped (already applied or users missing): ${alterSql}`)}try{await db.unsafe(indexSqlForDialect("CREATE UNIQUE INDEX IF NOT EXISTS idx_users_stripe_id ON users(stripe_id)",getDbDriver())).execute()}catch{if(options.verbose)log.debug("[auth-tables] Skipped users.stripe_id unique index (already applied or users missing)")}}export async function migrateAuthTables(options={}){const dbDriver=getDbDriver(),sql=sqlHelpers(dbDriver),{isPostgres,boolTrue,now,pkColumn,nullableTimestamp,datetime}=sql;if(options.verbose)log.info(`Creating auth tables for ${dbDriver}...`);try{if(options.verbose)log.info("Creating oauth_clients table...");await db.unsafe(`
+import process from"node:process";import{randomBytes}from"node:crypto";import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";import{indexSqlForDialect}from"./dialect";function getDbDriver(){return envVars.DB_CONNECTION||"sqlite"}export function usersEmailVerifiedAtSql(sql){return`ALTER TABLE users ADD COLUMN email_verified_at ${sql.nullableTimestamp}`}export function usersPasswordChangedAtSql(sql){return`ALTER TABLE users ADD COLUMN password_changed_at ${sql.nullableTimestamp}`}export function usersTwoFactorColumnsSql(sql){return["ALTER TABLE users ADD COLUMN two_factor_secret VARCHAR(255)",`ALTER TABLE users ADD COLUMN two_factor_enabled BOOLEAN NOT NULL DEFAULT ${sql.boolFalse}`,"ALTER TABLE users ADD COLUMN two_factor_last_used_step BIGINT"]}export function usersStripeIdSql(){return"ALTER TABLE users ADD COLUMN stripe_id VARCHAR(255)"}export function oauthAccessTokenDeviceColumnsSql(){return["ALTER TABLE oauth_access_tokens ADD COLUMN user_agent VARCHAR(255)","ALTER TABLE oauth_access_tokens ADD COLUMN ip_address VARCHAR(45)"]}export function passwordResetsExpiresAtSql(){return["ALTER TABLE password_resets ADD COLUMN expires_at TIMESTAMP"]}export async function ensureUsersAuthColumns(sql,options={}){const alters=[usersEmailVerifiedAtSql(sql),usersPasswordChangedAtSql(sql),...usersTwoFactorColumnsSql(sql),usersStripeIdSql()];for(const alterSql of alters)try{await db.unsafe(alterSql).execute()}catch{if(options.verbose)log.debug(`[auth-tables] Skipped (already applied or users missing): ${alterSql}`)}try{await db.unsafe(indexSqlForDialect("CREATE UNIQUE INDEX IF NOT EXISTS idx_users_stripe_id ON users(stripe_id)",getDbDriver())).execute()}catch{if(options.verbose)log.debug("[auth-tables] Skipped users.stripe_id unique index (already applied or users missing)")}}export async function migrateAuthTables(options={}){const dbDriver=getDbDriver(),sql=sqlHelpers(dbDriver),{isPostgres,boolTrue,now,pkColumn,nullableTimestamp,datetime,utcNow}=sql;if(options.verbose)log.info(`Creating auth tables for ${dbDriver}...`);try{if(options.verbose)log.info("Creating oauth_clients table...");await db.unsafe(`
       CREATE TABLE IF NOT EXISTS oauth_clients (
         ${pkColumn},
         name VARCHAR(255) NOT NULL,
@@ -8,7 +8,7 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         personal_access_client BOOLEAN NOT NULL DEFAULT ${sql.boolFalse},
         password_client BOOLEAN NOT NULL DEFAULT ${sql.boolFalse},
         revoked BOOLEAN NOT NULL DEFAULT ${sql.boolFalse},
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+        created_at ${datetime} DEFAULT ${utcNow},
         updated_at ${nullableTimestamp}
       )
     `).execute();if(options.verbose)log.info("Creating oauth_access_tokens table...");await db.unsafe(`
@@ -26,7 +26,7 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         -- a token minted by a script, which has neither.
         user_agent VARCHAR(255),
         ip_address VARCHAR(45),
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+        created_at ${datetime} DEFAULT ${utcNow},
         updated_at ${nullableTimestamp}
       )
     `).execute();await createTokenIndex("idx_oauth_access_tokens_token","oauth_access_tokens","token");for(const alterSql of oauthAccessTokenDeviceColumnsSql())try{await db.unsafe(alterSql).execute()}catch{if(options.verbose)log.debug(`[auth-tables] Skipped (already applied): ${alterSql}`)}if(options.verbose)log.info("Creating oauth_refresh_tokens table...");await db.unsafe(`
@@ -36,7 +36,7 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         token TEXT NOT NULL,
         revoked BOOLEAN NOT NULL DEFAULT ${sql.boolFalse},
         expires_at ${nullableTimestamp},
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP
+        created_at ${datetime} DEFAULT ${utcNow}
       )
     `).execute();await createTokenIndex("idx_oauth_refresh_tokens_token","oauth_refresh_tokens","token");if(options.verbose)log.info("Creating password_resets table...");await db.unsafe(`
       CREATE TABLE IF NOT EXISTS password_resets (
@@ -48,7 +48,7 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         -- still falls back to clock arithmetic against created_at, because
         -- rows written before the column existed have to keep verifying.
         expires_at ${nullableTimestamp},
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP
+        created_at ${datetime} DEFAULT ${utcNow}
       )
     `).execute();for(const alterSql of passwordResetsExpiresAtSql())try{await db.unsafe(alterSql).execute()}catch{if(options.verbose)log.debug(`[auth-tables] Skipped (already applied): ${alterSql}`)}try{await db.unsafe(indexSqlForDialect("CREATE INDEX IF NOT EXISTS idx_password_resets_email ON password_resets(email)",dbDriver)).execute()}catch{}if(options.verbose)log.info("Creating email_verifications table...");await db.unsafe(`
       CREATE TABLE IF NOT EXISTS email_verifications (
@@ -56,7 +56,7 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         user_id INTEGER NOT NULL,
         token VARCHAR(255) NOT NULL,
         expires_at ${datetime} NOT NULL,
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP
+        created_at ${datetime} DEFAULT ${utcNow}
       )
     `).execute();try{await db.unsafe(indexSqlForDialect("CREATE INDEX IF NOT EXISTS idx_email_verifications_user_id ON email_verifications(user_id)",dbDriver)).execute()}catch{}if(options.verbose)log.info("Creating passkeys table...");await db.unsafe(`
       CREATE TABLE IF NOT EXISTS passkeys (
@@ -70,7 +70,7 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         backup_eligible BOOLEAN NOT NULL DEFAULT ${sql.boolFalse},
         backup_status BOOLEAN NOT NULL DEFAULT ${sql.boolFalse},
         transports TEXT,
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+        created_at ${datetime} DEFAULT ${utcNow},
         last_used_at ${nullableTimestamp}
       )
     `).execute();try{await db.unsafe(indexSqlForDialect("CREATE INDEX IF NOT EXISTS idx_passkeys_user_id ON passkeys(user_id)",dbDriver)).execute()}catch{}if(options.verbose)log.info("Creating webauthn_challenges table...");await db.unsafe(`
@@ -80,21 +80,21 @@ import process from"node:process";import{randomBytes}from"node:crypto";import{lo
         challenge TEXT NOT NULL,
         purpose VARCHAR(20) NOT NULL,
         expires_at ${datetime} NOT NULL,
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP
+        created_at ${datetime} DEFAULT ${utcNow}
       )
     `).execute();try{await db.unsafe(indexSqlForDialect("CREATE UNIQUE INDEX IF NOT EXISTS idx_webauthn_challenges_user_purpose ON webauthn_challenges(user_id, purpose)",dbDriver)).execute()}catch{}if(options.verbose)log.info("Creating two_factor_challenges table...");await db.unsafe(`
       CREATE TABLE IF NOT EXISTS two_factor_challenges (
         id VARCHAR(255) PRIMARY KEY,
         user_id INTEGER NOT NULL,
         expires_at ${datetime} NOT NULL,
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP
+        created_at ${datetime} DEFAULT ${utcNow}
       )
     `).execute();try{await db.unsafe(indexSqlForDialect("CREATE INDEX IF NOT EXISTS idx_two_factor_challenges_user_id ON two_factor_challenges(user_id)",dbDriver)).execute()}catch{}if(options.verbose)log.info("Creating two_factor_pending_secrets table...");await db.unsafe(`
       CREATE TABLE IF NOT EXISTS two_factor_pending_secrets (
         user_id INTEGER PRIMARY KEY,
         secret VARCHAR(255) NOT NULL,
         expires_at ${datetime} NOT NULL,
-        created_at ${datetime} DEFAULT CURRENT_TIMESTAMP
+        created_at ${datetime} DEFAULT ${utcNow}
       )
     `).execute();if(options.verbose)log.info("Ensuring users auth columns exist (users may not exist yet on a fresh install \u2014 see ensureUsersAuthColumns)...");await ensureUsersAuthColumns(sql,options);if(options.verbose)log.info("Ensuring personal access client exists...");if((await db.unsafe(`
       SELECT id FROM oauth_clients WHERE personal_access_client = ${boolTrue} LIMIT 1

package/dist/notification-tables.js

@@ -1,22 +1,22 @@
-import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";import{indexSqlForDialect,isDuplicateIndexError}from"./dialect";function getDbDriver(){return process.env.DB_CONNECTION||envVars.DB_CONNECTION||"sqlite"}export function notificationsTableSql(sql){const{bigPkColumn,bigInteger,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS notifications (
+import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";import{indexSqlForDialect,isDuplicateIndexError}from"./dialect";function getDbDriver(){return process.env.DB_CONNECTION||envVars.DB_CONNECTION||"sqlite"}export function notificationsTableSql(sql){const{bigPkColumn,bigInteger,nullableTimestamp,datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS notifications (
     ${bigPkColumn},
     user_id ${bigInteger},
     type VARCHAR(255) NOT NULL,
     data TEXT NOT NULL,
     read_at ${nullableTimestamp},
     uuid VARCHAR(255),
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     updated_at ${nullableTimestamp}
-  )`}export function notificationPreferencesTableSql(sql){const{bigPkColumn,bigInteger,boolTrue,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS notification_preferences (
+  )`}export function notificationPreferencesTableSql(sql){const{bigPkColumn,bigInteger,boolTrue,nullableTimestamp,datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS notification_preferences (
     ${bigPkColumn},
     user_id ${bigInteger} NOT NULL,
     channel VARCHAR(50) NOT NULL,
     enabled BOOLEAN NOT NULL DEFAULT ${boolTrue},
     category VARCHAR(255),
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     updated_at ${nullableTimestamp},
     UNIQUE (user_id, channel, category)
-  )`}export function notificationDeliveriesTableSql(sql){const{bigPkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS notification_deliveries (
+  )`}export function notificationDeliveriesTableSql(sql){const{bigPkColumn,nullableTimestamp,datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS notification_deliveries (
     ${bigPkColumn},
     user_id INTEGER,
     channel VARCHAR(50) NOT NULL,
@@ -27,6 +27,6 @@ import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";imp
     error TEXT,
     metadata TEXT,
     sent_at ${nullableTimestamp},
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     updated_at ${nullableTimestamp}
   )`}async function createIndex(statement,dialect){try{await db.unsafe(indexSqlForDialect(statement,dialect)).execute()}catch(error){if(!isDuplicateIndexError(error))throw error}}const REQUIRED_COLUMNS={notifications:["id","user_id","type","data","read_at"],notification_preferences:["id","user_id","channel","enabled","category"],notification_deliveries:["id","user_id","channel","recipient","body","status"]};export const notificationTableNames=["notifications","notification_preferences","notification_deliveries"];export function notificationTablesMissingCreateStatements(sql){return notificationTableNames.filter((table)=>{const escaped=table.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");return!new RegExp(`\\bCREATE\\s+TABLE\\s+(?:IF\\s+NOT\\s+EXISTS\\s+)?["\\x60\\[]?${escaped}["\\x60\\]]?\\s*\\(`,"i").test(sql)})}async function warnOnShapeMismatch(table){const required=REQUIRED_COLUMNS[table];if(!required)return;try{const rows=await db.unsafe(`SELECT * FROM ${table} WHERE 1 = 0`).execute(),known=Array.isArray(rows)&&rows.length>0?Object.keys(rows[0]):null,missing=[];for(const column of required){if(known){if(!known.includes(column))missing.push(column);continue}try{await db.unsafe(`SELECT ${column} FROM ${table} WHERE 1 = 0`).execute()}catch{missing.push(column)}}if(missing.length>0)log.warn(`[notifications] "${table}" already exists without ${missing.join(", ")}. CREATE TABLE IF NOT EXISTS left it untouched, so the notification driver will fail on those columns. Something else owns this table - either rename it, or stop using the framework's notification tables.`)}catch{}}export async function migrateNotificationTables(options={}){const dbDriver=getDbDriver(),sql=sqlHelpers(dbDriver),tables=new Set(options.tables??notificationTableNames);if(options.verbose)log.info(`Creating notification tables for ${dbDriver}...`);try{if(tables.has("notifications")){if(options.verbose)log.info("Creating notifications table...");await warnOnShapeMismatch("notifications");await db.unsafe(notificationsTableSql(sql)).execute();await createIndex("CREATE INDEX IF NOT EXISTS idx_notifications_user ON notifications (user_id)",dbDriver)}if(tables.has("notification_preferences")){if(options.verbose)log.info("Creating notification_preferences table...");await warnOnShapeMismatch("notification_preferences");await db.unsafe(notificationPreferencesTableSql(sql)).execute();await createIndex("CREATE INDEX IF NOT EXISTS idx_notification_preferences_user ON notification_preferences (user_id)",dbDriver)}if(tables.has("notification_deliveries")){if(options.verbose)log.info("Creating notification deliveries table...");await warnOnShapeMismatch("notification_deliveries");await db.unsafe(notificationDeliveriesTableSql(sql)).execute();await createIndex("CREATE INDEX IF NOT EXISTS idx_notification_deliveries_channel ON notification_deliveries (channel)",dbDriver);await createIndex("CREATE INDEX IF NOT EXISTS idx_notification_deliveries_status ON notification_deliveries (status)",dbDriver)}if(options.verbose)log.success("Notification tables created");return{success:!0}}catch(error){const message=error instanceof Error?error.message:String(error);log.error(`Failed to create notification tables: ${message}`);return{success:!1,error:message}}}export async function ensureNotificationForeignKeys(options={}){if(getDbDriver()==="sqlite")return;for(const table of["notifications","notification_deliveries"]){const statements=[`ALTER TABLE ${table} DROP CONSTRAINT IF EXISTS "${table}_user_id_fk"`,`ALTER TABLE ${table} DROP CONSTRAINT IF EXISTS "${table}_user_id_fkey"`,`ALTER TABLE ${table} ADD CONSTRAINT "${table}_user_id_fk" FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE`];for(const statement of statements)try{await db.unsafe(statement).execute()}catch(error){if(options.verbose)log.debug(`[notification-tables] Skipped: ${statement} (${error instanceof Error?error.message:String(error)})`)}}}

package/dist/rbac-tables.js

@@ -1,32 +1,32 @@
-import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";function getDbDriver(){return envVars.DB_CONNECTION||"sqlite"}export function rolesTableSql(sql){const{pkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS roles (
+import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";function getDbDriver(){return envVars.DB_CONNECTION||"sqlite"}export function rolesTableSql(sql){const{pkColumn,nullableTimestamp,datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS roles (
     ${pkColumn},
     name VARCHAR(255) NOT NULL,
     guard_name VARCHAR(255) NOT NULL DEFAULT 'web',
     description TEXT,
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     updated_at ${nullableTimestamp},
     UNIQUE (name, guard_name)
-  )`}export function permissionsTableSql(sql){const{pkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS permissions (
+  )`}export function permissionsTableSql(sql){const{pkColumn,nullableTimestamp,datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS permissions (
     ${pkColumn},
     name VARCHAR(255) NOT NULL,
     guard_name VARCHAR(255) NOT NULL DEFAULT 'web',
     description TEXT,
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     updated_at ${nullableTimestamp},
     UNIQUE (name, guard_name)
-  )`}export function userRolesTableSql(sql){const{datetime}=sql;return`CREATE TABLE IF NOT EXISTS user_roles (
+  )`}export function userRolesTableSql(sql){const{datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS user_roles (
     user_id INTEGER NOT NULL,
     role_id INTEGER NOT NULL,
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     PRIMARY KEY (user_id, role_id)
-  )`}export function userPermissionsTableSql(sql){const{datetime}=sql;return`CREATE TABLE IF NOT EXISTS user_permissions (
+  )`}export function userPermissionsTableSql(sql){const{datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS user_permissions (
     user_id INTEGER NOT NULL,
     permission_id INTEGER NOT NULL,
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     PRIMARY KEY (user_id, permission_id)
-  )`}export function rolePermissionsTableSql(sql){const{datetime}=sql;return`CREATE TABLE IF NOT EXISTS role_permissions (
+  )`}export function rolePermissionsTableSql(sql){const{datetime,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS role_permissions (
     role_id INTEGER NOT NULL,
     permission_id INTEGER NOT NULL,
-    created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
+    created_at ${datetime} DEFAULT ${utcNow},
     PRIMARY KEY (role_id, permission_id)
   )`}export async function migrateRbacTables(options={}){const dbDriver=getDbDriver(),sql=sqlHelpers(dbDriver);if(options.verbose)log.info(`Creating RBAC tables for ${dbDriver}...`);try{if(options.verbose)log.info("Creating roles table...");await db.unsafe(rolesTableSql(sql)).execute();if(options.verbose)log.info("Creating permissions table...");await db.unsafe(permissionsTableSql(sql)).execute();if(options.verbose)log.info("Creating user_roles pivot...");await db.unsafe(userRolesTableSql(sql)).execute();if(options.verbose)log.info("Creating user_permissions pivot...");await db.unsafe(userPermissionsTableSql(sql)).execute();if(options.verbose)log.info("Creating role_permissions pivot...");await db.unsafe(rolePermissionsTableSql(sql)).execute();if(options.verbose)log.success("RBAC tables created");return{success:!0}}catch(error){const message=error instanceof Error?error.message:String(error);log.error(`Failed to create RBAC tables: ${message}`);return{success:!1,error:message}}}

package/dist/sql-helpers.d.ts

@@ -74,6 +74,7 @@ export declare interface SqlDialectHelpers {
   isMysql: boolean
   isSqlite: boolean
   now: string
+  utcNow: string
   boolTrue: string
   boolFalse: string
   autoIncrement: string

package/dist/sql-helpers.js

@@ -1 +1 @@
-import{dialectCapabilities}from"./dialect";export function sqlDateTime(value=new Date){return value.toISOString().slice(0,-1)}export function sqlDateTimeLiteral(value=new Date){return`'${sqlDateTime(value)}'`}export function parseSqlDateTime(value){if(value===null||value===void 0)return null;if(value instanceof Date)return Number.isNaN(value.getTime())?null:value;if(typeof value==="number")return Number.isNaN(value)?null:new Date(value);if(typeof value!=="string")return null;const trimmed=value.trim();if(!trimmed)return null;let normalized=trimmed.replace(" ","T");if(!/(?:Z|[+-]\d{2}:?\d{2})$/i.test(normalized))normalized+="Z";const parsed=new Date(normalized);return Number.isNaN(parsed.getTime())?null:parsed}export function sqlHelpers(driver){const caps=dialectCapabilities(driver),isPostgres=caps.wire==="postgres",isMysql=caps.wire==="mysql",isSqlite=caps.wire==="sqlite";return{driver,isPostgres,isMysql,isSqlite,now:isPostgres||isMysql?"NOW()":"datetime('now')",boolTrue:isPostgres?"true":"1",boolFalse:isPostgres?"false":"0",autoIncrement:isPostgres?"SERIAL":"INTEGER",bigInteger:isSqlite?"INTEGER":"BIGINT",primaryKey:!caps.supportsAutoIncrement?"PRIMARY KEY":isPostgres?"PRIMARY KEY":isMysql?"PRIMARY KEY AUTO_INCREMENT":"PRIMARY KEY AUTOINCREMENT",pkColumn:!caps.supportsAutoIncrement?"id BIGINT NOT NULL PRIMARY KEY":isPostgres?"id SERIAL PRIMARY KEY":isMysql?"id INTEGER PRIMARY KEY AUTO_INCREMENT":"id INTEGER PRIMARY KEY AUTOINCREMENT",bigPkColumn:!caps.supportsAutoIncrement?"id BIGINT NOT NULL PRIMARY KEY":isPostgres?"id BIGSERIAL PRIMARY KEY":isMysql?"id BIGINT PRIMARY KEY AUTO_INCREMENT":"id INTEGER PRIMARY KEY AUTOINCREMENT",datetime:isMysql?"DATETIME":"TIMESTAMP",nullableTimestamp:isMysql?"DATETIME NULL":"TIMESTAMP",param(index){return isPostgres?`$${index}`:"?"},params(...values){if(isPostgres)return{sql:values.map((_,i)=>`$${i+1}`).join(", "),values};return{sql:values.map(()=>"?").join(", "),values}}}}
+import{dialectCapabilities}from"./dialect";export function sqlDateTime(value=new Date){return value.toISOString().slice(0,-1)}export function sqlDateTimeLiteral(value=new Date){return`'${sqlDateTime(value)}'`}export function parseSqlDateTime(value){if(value===null||value===void 0)return null;if(value instanceof Date)return Number.isNaN(value.getTime())?null:value;if(typeof value==="number")return Number.isNaN(value)?null:new Date(value);if(typeof value!=="string")return null;const trimmed=value.trim();if(!trimmed)return null;let normalized=trimmed.replace(" ","T");if(!/(?:Z|[+-]\d{2}:?\d{2})$/i.test(normalized))normalized+="Z";const parsed=new Date(normalized);return Number.isNaN(parsed.getTime())?null:parsed}export function sqlHelpers(driver){const caps=dialectCapabilities(driver),isPostgres=caps.wire==="postgres",isMysql=caps.wire==="mysql",isSqlite=caps.wire==="sqlite";return{driver,isPostgres,isMysql,isSqlite,now:isPostgres||isMysql?"NOW()":"datetime('now')",utcNow:isPostgres?"(now() AT TIME ZONE 'utc')":isMysql?"UTC_TIMESTAMP":"CURRENT_TIMESTAMP",boolTrue:isPostgres?"true":"1",boolFalse:isPostgres?"false":"0",autoIncrement:isPostgres?"SERIAL":"INTEGER",bigInteger:isSqlite?"INTEGER":"BIGINT",primaryKey:!caps.supportsAutoIncrement?"PRIMARY KEY":isPostgres?"PRIMARY KEY":isMysql?"PRIMARY KEY AUTO_INCREMENT":"PRIMARY KEY AUTOINCREMENT",pkColumn:!caps.supportsAutoIncrement?"id BIGINT NOT NULL PRIMARY KEY":isPostgres?"id SERIAL PRIMARY KEY":isMysql?"id INTEGER PRIMARY KEY AUTO_INCREMENT":"id INTEGER PRIMARY KEY AUTOINCREMENT",bigPkColumn:!caps.supportsAutoIncrement?"id BIGINT NOT NULL PRIMARY KEY":isPostgres?"id BIGSERIAL PRIMARY KEY":isMysql?"id BIGINT PRIMARY KEY AUTO_INCREMENT":"id INTEGER PRIMARY KEY AUTOINCREMENT",datetime:isMysql?"DATETIME":"TIMESTAMP",nullableTimestamp:isMysql?"DATETIME NULL":"TIMESTAMP",param(index){return isPostgres?`$${index}`:"?"},params(...values){if(isPostgres)return{sql:values.map((_,i)=>`$${i+1}`).join(", "),values};return{sql:values.map(()=>"?").join(", "),values}}}}

package/dist/trait-tables.js

@@ -1,4 +1,4 @@
-import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";import{indexSqlForDialect,isDuplicateColumnError,isDuplicateIndexError}from"./dialect";export{indexSqlForDialect}from"./dialect";function getDbDriver(){return process.env.DB_CONNECTION||envVars.DB_CONNECTION||"sqlite"}function createdAt(sql){return`created_at ${sql.datetime}`}function updatedAt(sql){return`updated_at ${sql.nullableTimestamp}`}export function traitTableNames(){return["commentables","taggables","categorizables","commentable_upvotes","taggable_models","categorizable_models"]}export const UNSCOPED_OWNER_ID=0;export function commentablesTableSql(sql){const{pkColumn,boolTrue}=sql;return`CREATE TABLE IF NOT EXISTS commentables (
+import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";import{indexSqlForDialect,isDuplicateColumnError,isDuplicateIndexError}from"./dialect";export{indexSqlForDialect}from"./dialect";function getDbDriver(){return process.env.DB_CONNECTION||envVars.DB_CONNECTION||"sqlite"}function createdAt(sql){return`created_at ${sql.datetime}`}function updatedAt(sql){return`updated_at ${sql.nullableTimestamp}`}export function traitTableNames(){return["commentables","taggables","categorizables","commentable_upvotes","taggable_models","categorizable_models"]}export const UNSCOPED_OWNER_ID=0;export function commentablesTableSql(sql){const{pkColumn,boolTrue,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS commentables (
     ${pkColumn},
     title VARCHAR(255) NOT NULL,
     body TEXT NOT NULL,
@@ -11,7 +11,7 @@ import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";imp
     is_active BOOLEAN NOT NULL DEFAULT ${boolTrue},
     ${createdAt(sql)},
     ${updatedAt(sql)}
-  )`}export function taggablesTableSql(sql){const{pkColumn,boolTrue}=sql;return`CREATE TABLE IF NOT EXISTS taggables (
+  )`}export function taggablesTableSql(sql){const{pkColumn,boolTrue,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS taggables (
     ${pkColumn},
     name VARCHAR(255) NOT NULL,
     slug VARCHAR(255) NOT NULL,
@@ -21,7 +21,7 @@ import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";imp
     taggable_type VARCHAR(255) NOT NULL,
     ${createdAt(sql)},
     ${updatedAt(sql)}
-  )`}export function categorizablesTableSql(sql){const{pkColumn,boolTrue}=sql;return`CREATE TABLE IF NOT EXISTS categorizables (
+  )`}export function categorizablesTableSql(sql){const{pkColumn,boolTrue,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS categorizables (
     ${pkColumn},
     name VARCHAR(255) NOT NULL,
     slug VARCHAR(255) NOT NULL,
@@ -31,28 +31,28 @@ import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";imp
     categorizable_type VARCHAR(255) NOT NULL,
     ${createdAt(sql)},
     ${updatedAt(sql)}
-  )`}export function taggableModelsTableSql(sql){const{bigPkColumn,bigInteger}=sql;return`CREATE TABLE IF NOT EXISTS taggable_models (
+  )`}export function taggableModelsTableSql(sql){const{bigPkColumn,bigInteger,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS taggable_models (
     ${bigPkColumn},
     tag_id ${bigInteger} NOT NULL,
     taggable_id ${bigInteger} NOT NULL,
     taggable_type VARCHAR(255) NOT NULL DEFAULT 'posts',
-    created_at ${sql.datetime} NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    created_at ${sql.datetime} NOT NULL DEFAULT ${utcNow},
     ${updatedAt(sql)}
-  )`}export function categorizableModelsTableSql(sql){const{bigPkColumn,bigInteger}=sql;return`CREATE TABLE IF NOT EXISTS categorizable_models (
+  )`}export function categorizableModelsTableSql(sql){const{bigPkColumn,bigInteger,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS categorizable_models (
     ${bigPkColumn},
     category_id ${bigInteger} NOT NULL,
     categorizable_id ${bigInteger} NOT NULL,
     categorizable_type VARCHAR(255) NOT NULL DEFAULT 'posts',
-    created_at ${sql.datetime} NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    created_at ${sql.datetime} NOT NULL DEFAULT ${utcNow},
     ${updatedAt(sql)}
-  )`}export function likesTableSql(sql,table,foreignKey){const{pkColumn}=sql;return`CREATE TABLE IF NOT EXISTS ${table} (
+  )`}export function likesTableSql(sql,table,foreignKey){const{pkColumn,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS ${table} (
     ${pkColumn},
     ${foreignKey} INTEGER NOT NULL,
     user_id INTEGER NOT NULL,
     ${createdAt(sql)},
     ${updatedAt(sql)},
     UNIQUE (${foreignKey}, user_id)
-  )`}export function commentableUpvotesTableSql(sql){const{pkColumn}=sql;return`CREATE TABLE IF NOT EXISTS commentable_upvotes (
+  )`}export function commentableUpvotesTableSql(sql){const{pkColumn,utcNow}=sql;return`CREATE TABLE IF NOT EXISTS commentable_upvotes (
     ${pkColumn},
     user_id INTEGER,
     upvoteable_id INTEGER NOT NULL,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.366",
+  "version": "0.70.367",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -65,15 +65,15 @@
     "dynamodb-tooling": "^0.3.2"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.366",
-    "@stacksjs/config": "0.70.366",
-    "@stacksjs/logging": "0.70.366",
-    "@stacksjs/router": "0.70.366",
+    "@stacksjs/cli": "0.70.367",
+    "@stacksjs/config": "0.70.367",
+    "@stacksjs/logging": "0.70.367",
+    "@stacksjs/router": "0.70.367",
     "better-dx": "^0.2.17",
-    "@stacksjs/path": "0.70.366",
-    "@stacksjs/query-builder": "0.70.366",
-    "@stacksjs/storage": "0.70.366",
-    "@stacksjs/strings": "0.70.366",
-    "@stacksjs/utils": "0.70.366"
+    "@stacksjs/path": "0.70.367",
+    "@stacksjs/query-builder": "0.70.367",
+    "@stacksjs/storage": "0.70.367",
+    "@stacksjs/strings": "0.70.367",
+    "@stacksjs/utils": "0.70.367"
   }
 }