Fix test for Postgres

morf-integration-test/src/test/java/org/alfasoftware/morf/integration/TestDatabaseUpgradeIntegration.java

@@ -1121,7 +1121,7 @@ private void doAddColumn(Class<? extends UpgradeStep> upgradeStep) throws SQLExc
           "(?is)(" + "NULL not allowed for column \"ANOTHERVALUE\"" + ".*)" // H2
             + "|(" + "Field 'anotherValue' doesn't have a default value" + ".*)" // MySQL
             + "|(" + "ORA-01400: cannot insert NULL into \\(.*ANOTHERVALUE.*\\)" + ".*)" // Oracle
-            + "|(" + "ERROR: null value in column \"anothervalue\" violates not-null constraint" + ".*)" // PgSQL
+            + "|(" + "ERROR: null value in column \"anothervalue\" of relation \"withdefaultvalue\" violates not-null constraint" + ".*)" // PgSQL
         ));
     }
   }
@@ -1356,3 +1356,5 @@ private void compareTableRecords(String tableName, Iterable<Record> expectedReco
     }
   }
 }
+
+

morf-integration-test/src/test/java/org/alfasoftware/morf/upgrade/TestDatabaseUpgradePathValidationService.java

@@ -80,6 +80,7 @@ public void setup() {
 
   @After
   public void tearDown() {
+    dropUpgradeStatusTable();
     schemaManager.invalidateCache();
   }
 
@@ -144,3 +145,4 @@ private void addUpgradeAuditRecord() {
     sqlScriptExecutorProvider.get().execute(connectionResources.sqlDialect().convertStatementToSQL(insertIntoUpgradeAudit));
   }
 }
+

morf-postgresql/src/main/java/org/alfasoftware/morf/jdbc/postgresql/PostgreSQLDialect.java

@@ -522,7 +522,7 @@ protected String getSqlFrom(ConcatenatedField concatenatedField) {
 
   @Override
   protected String getSqlFrom(BlobFieldLiteral field) {
-    return String.format("E'\\x%s'", field.getValue());
+    return String.format("decode('%s','hex')", field.getValue());
   }
 
   @Override
@@ -1028,4 +1028,5 @@ private Optional<PostgreSQLMetaDataProvider> getPostgreSQLMetaDataProvider(Schem
             .filter(instanceOf(PostgreSQLMetaDataProvider.class))
             .map(PostgreSQLMetaDataProvider.class::cast);
   }
-}
+
+}

morf-postgresql/src/test/java/org/alfasoftware/morf/jdbc/postgresql/TestPostgreSQLDialect.java

@@ -567,7 +567,7 @@ protected String expectedBooleanLiteral(boolean value) {
    */
   @Override
   protected String expectedBlobLiteral(String value) {
-    return String.format("E'\\x%s'", value);
+    return String.format("decode('%s','hex')", value);
   }
 
 
@@ -1596,3 +1596,4 @@ protected String expectedPortableStatement() {
     return "UPDATE testschema.Table SET field = TRANSLATE(field, '1', 'A')";
   }
 }
+