diff --git a/crates/storage/migrations/20221018142001_init.up.sql b/crates/storage/migrations/20221018142001_init.up.sql index a5f1c0d9..979f1bec 100644 --- a/crates/storage/migrations/20221018142001_init.up.sql +++ b/crates/storage/migrations/20221018142001_init.up.sql @@ -18,11 +18,11 @@ CREATE TABLE "users" ( "user_id" UUID NOT NULL - CONSTRAINT "users_pkey" + CONSTRAINT "users_pkey" PRIMARY KEY, "username" TEXT NOT NULL - CONSTRAINT "users_username_unique" + CONSTRAINT "users_username_unique" UNIQUE, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL @@ -58,7 +58,7 @@ CREATE TABLE "user_emails" ( ALTER TABLE "users" ADD COLUMN "primary_user_email_id" UUID - CONSTRAINT "users_primary_user_email_id_fkey" + CONSTRAINT "users_primary_user_email_id_fkey" REFERENCES "user_emails" ("user_email_id") ON DELETE SET NULL; @@ -95,7 +95,7 @@ CREATE TABLE "user_sessions" ( CREATE TABLE "user_session_authentications" ( "user_session_authentication_id" UUID NOT NULL - CONSTRAINT "user_session_authentications_pkey" + CONSTRAINT "user_session_authentications_pkey" PRIMARY KEY, "user_session_id" UUID NOT NULL @@ -137,7 +137,7 @@ CREATE TABLE "compat_sso_logins" ( CONSTRAINT "compat_sessions_login_token_unique" UNIQUE, - "compat_session_id" UUID + "compat_session_id" UUID CONSTRAINT "compat_sso_logins_compat_session_id_fkey" REFERENCES "compat_sessions" ("compat_session_id") ON DELETE SET NULL, @@ -213,7 +213,7 @@ CREATE TABLE "oauth2_clients" ( "token_endpoint_auth_signing_alg" TEXT, "initiate_login_uri" TEXT, "userinfo_signed_response_alg" TEXT, - + "created_at" TIMESTAMP WITH TIME ZONE NULL ); diff --git a/crates/storage/src/compat.rs b/crates/storage/src/compat.rs index 7ce20355..74541ae1 100644 --- a/crates/storage/src/compat.rs +++ b/crates/storage/src/compat.rs @@ -344,7 +344,7 @@ pub async fn compat_login( let id = Ulid::from_datetime(created_at.into()); sqlx::query!( r#" - INSERT INTO compat_sessions + INSERT INTO compat_sessions (compat_session_id, user_id, device_id, created_at) VALUES ($1, $2, $3, $4) "#, @@ -383,7 +383,7 @@ pub async fn add_compat_access_token( sqlx::query!( r#" - INSERT INTO compat_access_tokens + INSERT INTO compat_access_tokens (compat_access_token_id, compat_session_id, access_token, created_at, expires_at) VALUES ($1, $2, $3, $4, $5) "#, @@ -532,7 +532,7 @@ pub async fn insert_compat_sso_login( let id = Ulid::from_datetime(created_at.into()); sqlx::query!( r#" - INSERT INTO compat_sso_logins + INSERT INTO compat_sso_logins (compat_sso_login_id, login_token, redirect_uri, created_at) VALUES ($1, $2, $3, $4) "#, diff --git a/crates/storage/src/oauth2/access_token.rs b/crates/storage/src/oauth2/access_token.rs index dd49e737..0be1be54 100644 --- a/crates/storage/src/oauth2/access_token.rs +++ b/crates/storage/src/oauth2/access_token.rs @@ -24,7 +24,7 @@ use super::client::{lookup_client, ClientFetchError}; use crate::{DatabaseInconsistencyError, PostgresqlBackend}; #[tracing::instrument( - skip_all, + skip_all, fields( session.id = %session.data, client.id = %session.client.data, @@ -237,7 +237,7 @@ where } #[tracing::instrument( - skip_all, + skip_all, fields(access_token.id = %access_token.data), err(Debug), )] @@ -272,7 +272,7 @@ pub async fn cleanup_expired(executor: impl PgExecutor<'_>) -> anyhow::Result