Restore storage test [updated] (#5350)

* Restore storage test

* Add groups search test

* Merged changes from #5280 and fixed problems caused by storage changes

* Code formatting

* Fix multiple cascade FK limitation in mssql

* Fixes for mssql + outbox

* Fixes for the mssql storage variant and for 3.0.1 patch scripts

* Fix patch scripts

---------

Co-authored-by: Carles Arnal <carlesarnal92@gmail.com>

Author: EricWittmann

app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java

@@ -1681,6 +1681,9 @@ public VersionSearchResultsDto searchVersions(Set<SearchFilter> filters, OrderBy
                 case globalId:
                     orderByQuery.append(" ORDER BY v.globalId");
                     break;
+                case groupId:
+                    orderByQuery.append(" ORDER BY v.groupId");
+                    break;
                 case version:
                     orderByQuery.append(" ORDER BY v.version");
                     break;
@@ -2686,6 +2689,8 @@ public void deleteAllUserData() {
 
             handle.createUpdate(sqlStatements.deleteAllVersionComments()).execute();
 
+            handle.createUpdate(sqlStatements.deleteAllBranchVersions()).execute();
+
             handle.createUpdate(sqlStatements.deleteAllBranches()).execute();
 
             handle.createUpdate(sqlStatements.deleteAllVersions()).execute();
@@ -2849,6 +2854,7 @@ public GroupSearchResultsDto searchGroups(Set<SearchFilter> filters, OrderBy ord
                         where.append(" AND l.groupId = g.groupId)");
                         break;
                     default:
+
                         break;
                 }
                 where.append(")");
@@ -3689,6 +3695,12 @@ public void deleteBranch(GA ga, BranchId branchId) {
         }
 
         handles.withHandleNoException(handle -> {
+            // First delete all branch versions (only needed for "mssql" due to cascade limitations there).
+            if (isMssql()) {
+                handle.createUpdate(sqlStatements.deleteBranchVersions()).bind(0, ga.getRawGroupId())
+                        .bind(1, ga.getRawArtifactId()).bind(2, branchId.getRawBranchId()).execute();
+            }
+
             var affected = handle.createUpdate(sqlStatements.deleteBranch()).bind(0, ga.getRawGroupId())
                     .bind(1, ga.getRawArtifactId()).bind(2, branchId.getRawBranchId()).execute();
 

app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java

@@ -1161,6 +1161,11 @@ public String deleteBranch() {
         return "DELETE FROM branches WHERE groupId = ? AND artifactId = ? AND branchId = ?";
     }
 
+    @Override
+    public String deleteAllBranchVersions() {
+        return "DELETE FROM branch_versions";
+    }
+
     @Override
     public String deleteAllBranches() {
         return "DELETE FROM branches";
@@ -1198,17 +1203,11 @@ public String deleteGroupRules() {
 
     @Override
     public String createOutboxEvent() {
-        return """
-                INSERT INTO outbox (id, aggregatetype, aggregateid, type, payload) \
-                VALUES (?, ?, ?, ?, ?::jsonb)\
-                """;
+        return "INSERT INTO outbox (id, aggregatetype, aggregateid, type, payload) VALUES (?, ?, ?, ?, ?)";
     }
 
     @Override
     public String deleteOutboxEvent() {
-        return """
-                DELETE FROM outbox o \
-                WHERE o.id= ?\
-                """;
+        return "DELETE FROM outbox WHERE id = ?";
     }
 }

app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java

@@ -78,4 +78,13 @@ public String createDataSnapshot() {
     public String restoreFromSnapshot() {
         throw new IllegalStateException("Restoring from snapshot is not supported for Postgresql storage");
     }
+
+    @Override
+    public String createOutboxEvent() {
+        return """
+                INSERT INTO outbox (id, aggregatetype, aggregateid, type, payload)
+                VALUES (?, ?, ?, ?, ?::jsonb)
+                """;
+    }
+
 }

app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java

@@ -25,7 +25,8 @@ public String dbType() {
      */
     @Override
     public boolean isPrimaryKeyViolation(Exception error) {
-        return error.getMessage().contains("Violation of PRIMARY KEY constraint");
+        return error.getMessage().contains("Violation of PRIMARY KEY constraint")
+                || error.getMessage().contains("Violation of UNIQUE KEY constraint");
     }
 
     /**
@@ -52,7 +53,7 @@ public String upsertBranch() {
                 ON (target.groupId = source.groupId AND target.artifactId = source.artifactId AND target.branchId = source.branchId)
                 WHEN NOT MATCHED THEN
                 INSERT (groupId, artifactId, branchId, description, systemDefined, owner, createdOn, modifiedBy, modifiedOn)
-                VALUES (source.groupId, source.artifactId, source.branchId, source.description, source.systemDefined, source.owner, source.createdOn, source.modifiedBy, source.modifiedOn)
+                VALUES (source.groupId, source.artifactId, source.branchId, source.description, source.systemDefined, source.owner, source.createdOn, source.modifiedBy, source.modifiedOn);
                 """;
     }
 
@@ -70,7 +71,7 @@ public String getNextSequenceValue() {
                 WHEN NOT MATCHED THEN
                 INSERT (seqName, seqValue)
                 VALUES (source.seqName, 1)
-                OUTPUT INSERTED.seqValue
+                OUTPUT INSERTED.seqValue;
                 """;
     }
 
@@ -88,7 +89,7 @@ public String resetSequenceValue() {
                 WHEN NOT MATCHED THEN
                 INSERT (seqName, seqValue)
                 VALUES (source.seqName, source.seqValue)
-                OUTPUT INSERTED.seqValue
+                OUTPUT INSERTED.seqValue;
                 """;
     }
 
@@ -111,17 +112,17 @@ public String selectGroups() {
 
     @Override
     public String selectBranchTip() {
-        return "SELECT ab.groupId, ab.artifactId, ab.version FROM artifact_branches ab "
-                + "WHERE ab.groupId = ? AND ab.artifactId = ? AND ab.branchId = ? "
-                + "ORDER BY ab.branchOrder DESC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY";
+        return "SELECT bv.groupId, bv.artifactId, bv.version FROM branch_versions bv "
+                + "WHERE bv.groupId = ? AND bv.artifactId = ? AND bv.branchId = ? "
+                + "ORDER BY bv.branchOrder DESC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY";
     }
 
     @Override
     public String selectBranchTipFilteredByState() {
-        return "SELECT ab.groupId, ab.artifactId, ab.version FROM artifact_branches ab "
-                + "JOIN versions v ON ab.groupId = v.groupId AND ab.artifactId = v.artifactId AND ab.version = v.version "
-                + "WHERE ab.groupId = ? AND ab.artifactId = ? AND ab.branchId = ? AND v.state IN (?) "
-                + "ORDER BY ab.branchOrder DESC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY";
+        return "SELECT bv.groupId, bv.artifactId, bv.version FROM branch_versions bv "
+                + "JOIN versions v ON bv.groupId = v.groupId AND bv.artifactId = v.artifactId AND bv.version = v.version "
+                + "WHERE bv.groupId = ? AND bv.artifactId = ? AND bv.branchId = ? AND v.state IN (?) "
+                + "ORDER BY bv.branchOrder DESC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY";
     }
 
     @Override

app/src/main/java/io/apicurio/registry/storage/impl/sql/SqlStatements.java

@@ -634,6 +634,8 @@ public interface SqlStatements {
 
     public String deleteBranch();
 
+    public String deleteAllBranchVersions();
+
     public String deleteAllBranches();
 
     public String deleteVersionFromBranch();

app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl

@@ -97,11 +97,11 @@ ALTER TABLE branches ADD CONSTRAINT FK_branches_1 FOREIGN KEY (groupId, artifact
 
 CREATE TABLE branch_versions (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, branchId NVARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version NVARCHAR(256) NOT NULL);
 ALTER TABLE branch_versions ADD PRIMARY KEY (groupId, artifactId, branchId, version);
-ALTER TABLE branch_versions ADD CONSTRAINT FK_branch_versions_1 FOREIGN KEY (groupId, artifactId, branchId) REFERENCES branches(groupId, artifactId, branchId) ON DELETE CASCADE;
+ALTER TABLE branch_versions ADD CONSTRAINT FK_branch_versions_1 FOREIGN KEY (groupId, artifactId, branchId) REFERENCES branches(groupId, artifactId, branchId);
 ALTER TABLE branch_versions ADD CONSTRAINT FK_branch_versions_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE;
 CREATE INDEX IDX_branch_versions_1 ON branch_versions(groupId, artifactId, branchId, branchOrder);
 CREATE INDEX IDX_branch_versions_2 ON branch_versions(branchId);
 CREATE INDEX IDX_branch_versions_3 ON branch_versions(branchOrder);
 
-CREATE TABLE outbox (id VARCHAR(128) NOT NULL, aggregatetype VARCHAR(255) NOT NULL, aggregateid VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, payload JSONB NOT NULL);
+CREATE TABLE outbox (id VARCHAR(128) NOT NULL, aggregatetype VARCHAR(255) NOT NULL, aggregateid VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, payload TEXT NOT NULL);
 ALTER TABLE outbox ADD PRIMARY KEY (id);

app/src/main/resources/io/apicurio/registry/storage/impl/sql/upgrades/101/h2.upgrade.ddl

@@ -1,4 +1,6 @@
 -- *********************************************************************
 -- DDL for the Apicurio Registry - Database: H2
 -- Upgrade Script from 100 to 101
--- *********************************************************************
+-- *********************************************************************
+
+UPDATE apicurio SET propValue = 101 WHERE propName = 'db_version';

app/src/main/resources/io/apicurio/registry/storage/impl/sql/upgrades/101/mssql.upgrade.ddl

@@ -3,5 +3,7 @@
 -- Upgrade Script from 100 to 101
 -- *********************************************************************
 
-CREATE TABLE outbox (id VARCHAR(128) NOT NULL, aggregatetype VARCHAR(255) NOT NULL, aggregateid VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, payload JSONB NOT NULL);
-ALTER TABLE outbox ADD PRIMARY KEY (id);
+UPDATE apicurio SET propValue = 101 WHERE propName = 'db_version';
+
+CREATE TABLE outbox (id VARCHAR(128) NOT NULL, aggregatetype VARCHAR(255) NOT NULL, aggregateid VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, payload TEXT NOT NULL);
+ALTER TABLE outbox ADD PRIMARY KEY (id);

app/src/main/resources/io/apicurio/registry/storage/impl/sql/upgrades/101/postgresql.upgrade.ddl

@@ -3,5 +3,7 @@
 -- Upgrade Script from 100 to 101
 -- *********************************************************************
 
+UPDATE apicurio SET propValue = 101 WHERE propName = 'db_version';
+
 CREATE TABLE outbox (id VARCHAR(128) NOT NULL, aggregatetype VARCHAR(255) NOT NULL, aggregateid VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, payload JSONB NOT NULL);
-ALTER TABLE outbox ADD PRIMARY KEY (id);
+ALTER TABLE outbox ADD PRIMARY KEY (id);