diff --git a/.editorconfig b/.editorconfig index 8ad12948d..0466ef21c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,15 +7,11 @@ trim_trailing_whitespace = true end_of_line = lf insert_final_newline = true -[.buildkite/hooks/**] +[{.buildkite/hooks/**,*.sh,*.yml,*.yaml}] indent_style = space indent_size = 2 -[*.{sh,yml,yaml}] -indent_style = space -indent_size = 2 - -[web/**] +[{web/**,*.sql}] indent_style = space [{web/package.json,web/pnpm-lock.yaml}] diff --git a/internal/storage/migrations/V0006.ConsentPreConfiguration.mysql.up.sql b/internal/storage/migrations/V0006.ConsentPreConfiguration.mysql.up.sql index a74a42fb9..2e15cdd7f 100644 --- a/internal/storage/migrations/V0006.ConsentPreConfiguration.mysql.up.sql +++ b/internal/storage/migrations/V0006.ConsentPreConfiguration.mysql.up.sql @@ -2,9 +2,9 @@ CREATE TABLE oauth2_consent_preconfiguration ( id INTEGER AUTO_INCREMENT, client_id VARCHAR(255) NOT NULL, subject CHAR(36) NOT NULL, - created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - expires_at TIMESTAMP NULL DEFAULT NULL, - revoked BOOLEAN NOT NULL DEFAULT FALSE, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + expires_at TIMESTAMP NULL DEFAULT NULL, + revoked BOOLEAN NOT NULL DEFAULT FALSE, scopes TEXT NOT NULL, audience TEXT NULL, PRIMARY KEY (id), diff --git a/internal/storage/migrations/V0006.ConsentPreConfiguration.postgres.up.sql b/internal/storage/migrations/V0006.ConsentPreConfiguration.postgres.up.sql index 964ddd3d9..21f1319d6 100644 --- a/internal/storage/migrations/V0006.ConsentPreConfiguration.postgres.up.sql +++ b/internal/storage/migrations/V0006.ConsentPreConfiguration.postgres.up.sql @@ -2,9 +2,9 @@ CREATE TABLE oauth2_consent_preconfiguration ( id SERIAL, client_id VARCHAR(255) NOT NULL, subject CHAR(36) NOT NULL, - created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, + created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, expires_at TIMESTAMP WITH TIME ZONE NULL DEFAULT NULL, - revoked BOOLEAN NOT NULL DEFAULT FALSE, + revoked BOOLEAN NOT NULL DEFAULT FALSE, scopes TEXT NOT NULL, audience TEXT NULL, PRIMARY KEY (id), diff --git a/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.down.sql b/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.down.sql index e4bfaefeb..c98c1f49a 100644 --- a/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.down.sql +++ b/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.down.sql @@ -19,8 +19,8 @@ CREATE TABLE oauth2_consent_session ( form_data TEXT NOT NULL, requested_scopes TEXT NOT NULL, granted_scopes TEXT NOT NULL, - requested_audience TEXT NULL DEFAULT '', - granted_audience TEXT NULL DEFAULT '', + requested_audience TEXT NULL DEFAULT '', + granted_audience TEXT NULL DEFAULT '', PRIMARY KEY (id), CONSTRAINT oauth2_consent_session_subject_fkey FOREIGN KEY(subject) diff --git a/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.up.sql b/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.up.sql index 3f1bccef3..544574e6d 100644 --- a/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.up.sql +++ b/internal/storage/migrations/V0006.ConsentPreConfiguration.sqlite.up.sql @@ -2,9 +2,9 @@ CREATE TABLE oauth2_consent_preconfiguration ( id INTEGER, client_id VARCHAR(255) NOT NULL, subject CHAR(36) NOT NULL, - created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - expires_at TIMESTAMP NULL DEFAULT NULL, - revoked BOOLEAN NOT NULL DEFAULT FALSE, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + expires_at TIMESTAMP NULL DEFAULT NULL, + revoked BOOLEAN NOT NULL DEFAULT FALSE, scopes TEXT NOT NULL, audience TEXT NULL, PRIMARY KEY (id),