Update dependencies.

Update com.github.ben-manes.caffeine:caffeine 3.1.6 → 3.1.8. Update io.opentelemetry:opentelemetry-sdk-logs 1.27.0 → 1.28.0. Update org.jetbrains.kotlin:kotlin-stdlib 1.9.0-RC → 1.9.0. Update com.squareup.okio:okio-jvm 3.3.0 → 3.5.0. Update com.helger:ph-css 7.0.0 → 7.0.1. Update org.junit.jupiter:junit-jupiter-api 5.10.0-M1 → 5.10.0. Update org.junit.jupiter:junit-jupiter-engine 5.10.0-M1 → 5.10.0. Update net.jqwik:jqwik-api 1.7.3 → 1.7.4. Update net.jqwik:jqwik-engine 1.7.3 → 1.7.4. Update io.opentelemetry:opentelemetry-bom 1.27.0 → 1.28.0. Update com.io7m.quarrel:com.io7m.quarrel.core 1.2.0 → 1.3.0. Update com.io7m.quarrel:com.io7m.quarrel.ext.logback 1.2.0 → 1.3.0. Update com.io7m.quarrel:com.io7m.quarrel.ext.xstructural 1.2.0 → 1.3.0. Update ch.qos.logback:logback-classic 1.4.8 → 1.4.11. Update ch.qos.logback:logback-core 1.4.8 → 1.4.11. Update com.io7m.jqpage:com.io7m.jqpage.core 0.0.2 → 0.0.3. Update com.io7m.trasco:com.io7m.trasco.api 1.0.0 → 1.1.0. Update com.io7m.trasco:com.io7m.trasco.vanilla 1.0.0 → 1.1.0. Update org.jooq:jooq 3.18.5 → 3.18.6. Update org.jooq:jooq-postgres-extensions 3.18.5 → 3.18.6.
io7m-com · Aug 10, 2023 · 8437acb · 8437acb
1 parent 07d3bfb
commit 8437acb
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 83 deletions.
diff --git a/...es/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabaseAdminsQueries.java b/...es/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabaseAdminsQueries.java
@@ -41,6 +41,7 @@
 import com.io7m.jqpage.core.JQField;
 import com.io7m.jqpage.core.JQKeysetRandomAccessPageDefinition;
 import com.io7m.jqpage.core.JQKeysetRandomAccessPagination;
+import com.io7m.jqpage.core.JQKeysetRandomAccessPaginationParameters;
 import com.io7m.jqpage.core.JQOrder;
 import org.jooq.Condition;
 import org.jooq.Result;
@@ -714,14 +715,14 @@ public IdDatabaseAdminSearchType adminSearch(
       final var pages =
         JQKeysetRandomAccessPagination.createPageDefinitions(
           context,
-          ADMINS,
-          List.of(orderField),
-          List.of(allConditions),
-          List.of(),
-          Integer.toUnsignedLong(parameters.limit()),
-          statement -> {
-            querySpan.setAttribute(DB_STATEMENT, statement.toString());
-          }
+          JQKeysetRandomAccessPaginationParameters.forTable(ADMINS)
+            .addSortField(orderField)
+            .addWhereCondition(allConditions)
+            .setPageSize(Integer.toUnsignedLong(parameters.limit()))
+            .setStatementListener(statement -> {
+              querySpan.setAttribute(DB_STATEMENT, statement.toString());
+            })
+            .build()
         );
 
       return new AdminsSearch(pages);
@@ -1180,14 +1181,15 @@ public IdDatabaseAdminSearchByEmailType adminSearchByEmail(
       final var pages =
         JQKeysetRandomAccessPagination.createPageDefinitions(
           context,
-          baseTable,
-          List.of(orderField),
-          List.of(allConditions),
-          List.of(ADMINS.ID),
-          Integer.toUnsignedLong(parameters.limit()),
-          statement -> {
-            querySpan.setAttribute(DB_STATEMENT, statement.toString());
-          }
+          JQKeysetRandomAccessPaginationParameters.forTable(baseTable)
+            .addSortField(orderField)
+            .addWhereCondition(allConditions)
+            .addGroupByField(ADMINS.ID)
+            .setPageSize(Integer.toUnsignedLong(parameters.limit()))
+            .setStatementListener(statement -> {
+              querySpan.setAttribute(DB_STATEMENT, statement.toString());
+            })
+            .build()
         );
 
       return new AdminsByEmailSearch(pages);

diff --git a/...res/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabaseAuditQueries.java b/...res/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabaseAuditQueries.java
@@ -26,6 +26,7 @@
 import com.io7m.jqpage.core.JQField;
 import com.io7m.jqpage.core.JQKeysetRandomAccessPageDefinition;
 import com.io7m.jqpage.core.JQKeysetRandomAccessPagination;
+import com.io7m.jqpage.core.JQKeysetRandomAccessPaginationParameters;
 import com.io7m.jqpage.core.JQOrder;
 import org.jooq.Condition;
 import org.jooq.Select;
@@ -115,14 +116,14 @@ public IdDatabaseAuditEventsSearchType auditEventsSearch(
       final var pages =
         JQKeysetRandomAccessPagination.createPageDefinitions(
           context,
-          baseTable,
-          List.of(new JQField(AUDIT.ID, JQOrder.ASCENDING)),
-          List.of(allConditions),
-          List.of(),
-          Integer.toUnsignedLong(parameters.limit()),
-          statement -> {
-            querySpan.setAttribute(DB_STATEMENT, statement.toString());
-          }
+          JQKeysetRandomAccessPaginationParameters.forTable(baseTable)
+            .setPageSize(Integer.toUnsignedLong(parameters.limit()))
+            .addSortField(new JQField(AUDIT.ID, JQOrder.ASCENDING))
+            .addWhereCondition(allConditions)
+            .setStatementListener(statement -> {
+              querySpan.setAttribute(DB_STATEMENT, statement.toString());
+            })
+            .build()
         );
 
       return new AuditEventsSearch(baseTable, pages);

diff --git a/...res/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabaseUsersQueries.java b/...res/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabaseUsersQueries.java
@@ -45,6 +45,7 @@
 import com.io7m.jqpage.core.JQField;
 import com.io7m.jqpage.core.JQKeysetRandomAccessPageDefinition;
 import com.io7m.jqpage.core.JQKeysetRandomAccessPagination;
+import com.io7m.jqpage.core.JQKeysetRandomAccessPaginationParameters;
 import com.io7m.jqpage.core.JQOrder;
 import org.jooq.Condition;
 import org.jooq.DSLContext;
@@ -1204,14 +1205,14 @@ public IdDatabaseUserSearchType userSearch(
       final var pages =
         JQKeysetRandomAccessPagination.createPageDefinitions(
           context,
-          USERS,
-          List.of(orderField),
-          List.of(allConditions),
-          List.of(),
-          Integer.toUnsignedLong(parameters.limit()),
-          statement -> {
-            querySpan.setAttribute(DB_STATEMENT, statement.toString());
-          }
+          JQKeysetRandomAccessPaginationParameters.forTable(USERS)
+            .addSortField(orderField)
+            .setPageSize(Integer.toUnsignedLong(parameters.limit()))
+            .addWhereCondition(allConditions)
+            .setStatementListener(statement -> {
+              querySpan.setAttribute(DB_STATEMENT, statement.toString());
+            })
+            .build()
         );
 
       return new IdDatabaseUsersQueries.UsersSearch(pages);
@@ -1279,14 +1280,15 @@ public IdDatabaseUserSearchByEmailType userSearchByEmail(
       final var pages =
         JQKeysetRandomAccessPagination.createPageDefinitions(
           context,
-          baseTable,
-          List.of(orderField),
-          List.of(allConditions),
-          List.of(USERS.ID),
-          Integer.toUnsignedLong(parameters.limit()),
-          statement -> {
-            querySpan.setAttribute(DB_STATEMENT, statement.toString());
-          }
+          JQKeysetRandomAccessPaginationParameters.forTable(baseTable)
+            .addSortField(orderField)
+            .addWhereCondition(allConditions)
+            .addGroupByField(USERS.ID)
+            .setPageSize(Integer.toUnsignedLong(parameters.limit()))
+            .setStatementListener(statement -> {
+              querySpan.setAttribute(DB_STATEMENT, statement.toString());
+            })
+            .build()
         );
 
       return new IdDatabaseUsersQueries.UsersByEmailSearch(

diff --git a/...base.postgres/src/main/resources/com/io7m/idstore/database/postgres/internal/database.xml b/...base.postgres/src/main/resources/com/io7m/idstore/database/postgres/internal/database.xml
@@ -3,8 +3,9 @@
 <Schemas xmlns="urn:com.io7m.trasco.database.statements:1:0">
   <Schema versionCurrent="0">
     <Comment>
-      The idstore role is a least-privilege role that can perform only those operations required to run the system and
-      no others. The role is initially set to "nologin" as a password will be assigned later and logins enabled.
+      The idstore role is a least-privilege role that can perform only those
+      operations required to run the system and no others. The role is initially
+      set to "nologin" as a password will be assigned later and logins enabled.
     </Comment>
 
     <Statement><![CDATA[
@@ -15,7 +16,8 @@ create role idstore with nosuperuser nocreatedb nocreaterole noinherit nologin;
 ]]></Statement>
 
     <Comment>
-      The idstore_none role is a no-privilege role that cannot perform any actions.
+      The idstore_none role is a no-privilege role that cannot perform any
+      actions.
     </Comment>
 
     <Statement><![CDATA[
@@ -26,9 +28,10 @@ create role idstore_none with nosuperuser nocreatedb nocreaterole noinherit nolo
 ]]></Statement>
 
     <Comment>
-      The schema version table stores the current version of the database schema. Implementations are expected to query
-      this table on connecting to the database in order to ensure that the calling code is compatible with the tables in
-      the database.
+      The schema version table stores the current version of the database
+      schema. Implementations are expected to query this table on connecting to
+      the database in order to ensure that the calling code is compatible with
+      the tables in the database.
     </Comment>
 
     <Statement><![CDATA[
@@ -79,7 +82,8 @@ create table admins (
 )
 ]]></Statement>
 
-    <Statement>grant select, insert, update, delete on admins to idstore</Statement>
+    <Statement>grant select, insert, update, delete on admins to idstore
+    </Statement>
     <Statement>grant select (id) on admins to idstore_none</Statement>
 
     <Statement><![CDATA[
@@ -134,13 +138,15 @@ create table users (
 )
 ]]></Statement>
 
-    <Statement>grant select, insert, update, delete on users to idstore</Statement>
+    <Statement>grant select, insert, update, delete on users to idstore
+    </Statement>
     <Statement>grant select (id) on users to idstore_none</Statement>
 
     <Comment>
-      The emails table stores the set of email addresses used by users/admins. Note that
-      email addresses *do* have a unique constraint, but it's enforced by a separate index
-      that determines uniqueness based on the lowercase email address.
+      The emails table stores the set of email addresses used by users/admins.
+      Note that email addresses *do* have a unique constraint, but it's enforced
+      by a separate index that determines uniqueness based on the lowercase
+      email address.
     </Comment>
 
     <Statement><![CDATA[
@@ -167,8 +173,8 @@ create unique index emails_unique_lower_email_idx on emails (lower(email_address
 ]]></Statement>
 
     <Comment>
-      The email_check_delete trigger enforces the constraint that users must have at least one email address at any
-      time.
+      The email_check_delete trigger enforces the constraint that users must
+      have at least one email address at any time.
     </Comment>
 
     <Statement><![CDATA[
@@ -207,7 +213,8 @@ create trigger email_check_delete_trigger
 ]]></Statement>
 
     <Comment>
-      The audit table stores a list of auditable events. Who did it? What did they do? When did they do it?
+      The audit table stores a list of auditable events. Who did it? What did
+      they do? When did they do it?
     </Comment>
 
     <Statement><![CDATA[
@@ -240,12 +247,14 @@ create table login_history (
 )
 ]]></Statement>
 
-    <Statement>grant insert, select, delete on login_history to idstore</Statement>
+    <Statement>grant insert, select, delete on login_history to idstore
+    </Statement>
 
     <Comment>
-      The email_verifications table records the email verification operations in process. A verification has an
-      associated user/admin, email address, verification token, expiration date, and operation. The operation is a value
-      of com.io7m.idstore.model.IdEmailVerificationOperation.
+      The email_verifications table records the email verification operations in
+      process. A verification has an associated user/admin, email address,
+      verification token, expiration date, and operation. The operation is a
+      value of com.io7m.idstore.model.IdEmailVerificationOperation.
     </Comment>
 
     <Statement><![CDATA[
@@ -262,10 +271,12 @@ create table email_verifications (
 )
 ]]></Statement>
 
-    <Statement>grant insert, select, delete on email_verifications to idstore</Statement>
+    <Statement>grant insert, select, delete on email_verifications to idstore
+    </Statement>
 
     <Comment>
-      The bans table records the reason any given account might be banned, and when that ban expires (if it expires).
+      The bans table records the reason any given account might be banned, and
+      when that ban expires (if it expires).
     </Comment>
 
     <Statement><![CDATA[
@@ -278,11 +289,13 @@ create table bans (
 )
 ]]></Statement>
 
-    <Statement>grant insert, select, update, delete on bans to idstore</Statement>
+    <Statement>grant insert, select, update, delete on bans to idstore
+    </Statement>
 
     <Comment>
-      The user_password_resets table records the password reset operations in process. A verification
-      has an associated user, verification token, and expiration date.
+      The user_password_resets table records the password reset operations in
+      process. A verification has an associated user, verification token, and
+      expiration date.
     </Comment>
 
     <Statement><![CDATA[
@@ -295,13 +308,15 @@ create table user_password_resets (
 )
 ]]></Statement>
 
-    <Statement>grant insert, select, delete on user_password_resets to idstore</Statement>
+    <Statement>grant insert, select, delete on user_password_resets to idstore
+    </Statement>
   </Schema>
 
   <Schema versionCurrent="2">
     <Comment>
-      The idstore_read_only role is a read-only role that can read all data but cannot change anything.
-      The role is initially set to "nologin" as a password may be assigned later and logins enabled.
+      The idstore_read_only role is a read-only role that can read all data but
+      cannot change anything. The role is initially set to "nologin" as a
+      password may be assigned later and logins enabled.
     </Comment>
 
     <Statement><![CDATA[
@@ -314,12 +329,16 @@ create role idstore_read_only with nosuperuser nocreatedb nocreaterole noinherit
     <Statement>grant select on admins to idstore_read_only</Statement>
     <Statement>grant select on audit to idstore_read_only</Statement>
     <Statement>grant select on bans to idstore_read_only</Statement>
-    <Statement>grant select on email_verifications to idstore_read_only</Statement>
+    <Statement>
+      grant select on email_verifications to idstore_read_only
+    </Statement>
     <Statement>grant select on emails to idstore_read_only</Statement>
     <Statement>grant select on login_history to idstore_read_only</Statement>
     <Statement>grant select on schema_version to idstore_read_only</Statement>
     <Statement>grant select on user_ids to idstore_read_only</Statement>
-    <Statement>grant select on user_password_resets to idstore_read_only</Statement>
+    <Statement>
+      grant select on user_password_resets to idstore_read_only
+    </Statement>
     <Statement>grant select on users to idstore_read_only</Statement>
   </Schema>
 </Schemas>
diff --git a/...tore.shell.admin/src/main/java/com/io7m/idstore/shell/admin/internal/IdAShellCmdHelp.java b/...tore.shell.admin/src/main/java/com/io7m/idstore/shell/admin/internal/IdAShellCmdHelp.java
@@ -24,6 +24,7 @@
 import com.io7m.quarrel.core.QCommandTreeResolver.QResolutionOKCommand;
 import com.io7m.quarrel.core.QCommandTreeResolver.QResolutionOKGroup;
 import com.io7m.quarrel.core.QCommandTreeResolver.QResolutionRoot;
+import com.io7m.quarrel.core.QException;
 import com.io7m.quarrel.core.QParameterNamedType;
 import com.io7m.quarrel.core.QParametersPositionalAny;
 import com.io7m.quarrel.core.QParametersPositionalType;
@@ -75,6 +76,7 @@ public QParametersPositionalType onListPositionalParameters()
   @Override
   public QCommandStatus onExecute(
     final QCommandContextType context)
+    throws QException
   {
     final var resolution =
       QCommandTreeResolver.resolve(