Fix Oracle tests

schemacrawler-dbtest/src/test/java/schemacrawler/integration/test/WithoutPluginDB2Test.java

@@ -64,8 +64,7 @@
 @ResolveTestContext
 public class WithoutPluginDB2Test extends BaseAdditionalDatabaseTest {
 
-  private final DockerImageName imageName =
-      DockerImageName.parse("icr.io/db2_community/db2");
+  private final DockerImageName imageName = DockerImageName.parse("icr.io/db2_community/db2");
 
   @Container
   private final JdbcDatabaseContainer<?> dbContainer =

schemacrawler-oracle/src/main/java/schemacrawler/server/oracle/OracleSchemaExclusionRule.java

@@ -30,7 +30,6 @@
 
 import java.util.Arrays;
 import java.util.function.Predicate;
-
 import schemacrawler.inclusionrule.InclusionRule;
 import schemacrawler.inclusionrule.ListExclusionRule;
 import schemacrawler.inclusionrule.RegularExpressionExclusionRule;
@@ -100,7 +99,8 @@ public final class OracleSchemaExclusionRule implements InclusionRule {
                   "XDB",
                   "XS$NULL"))
           .and(new RegularExpressionExclusionRule("APEX_[0-9]{6}"))
-          .and(new RegularExpressionExclusionRule("FLOWS_[0-9]{5,6}"));
+          .and(new RegularExpressionExclusionRule("FLOWS_[0-9]{5,6}"))
+          .and(new RegularExpressionExclusionRule("OPS\\$ORACLE"));
 
   /** {@inheritDoc} */
   @Override

schemacrawler-oracle/src/main/resources/oracle.information_schema/ADDITIONAL_TABLE_ATTRIBUTES.sql

@@ -17,6 +17,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(TABLES.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(TABLES.OWNER || '.' || TABLES.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/CHECK_CONSTRAINTS.sql

@@ -12,6 +12,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(CONSTRAINTS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(CONSTRAINTS.OWNER || '.' || CONSTRAINTS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/CONSTRAINT_COLUMN_USAGE.sql

@@ -18,6 +18,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(TABLE_CONTRAINTS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(TABLE_CONTRAINTS.OWNER || '.' || TABLE_CONTRAINTS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/EXT_HIDDEN_TABLE_COLUMNS.sql

@@ -10,6 +10,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(COLUMNS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(COLUMNS.OWNER || '.' || COLUMNS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/EXT_INDEXES.sql

@@ -14,6 +14,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(INDEXES.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(INDEXES.OWNER || '.' || INDEXES.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/EXT_SYNONYMS.sql

@@ -12,6 +12,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(SYNONYMS.OWNER, '${schema-inclusion-rule}')
   AND SYNONYMS.TABLE_NAME NOT LIKE 'BIN$%'

schemacrawler-oracle/src/main/resources/oracle.information_schema/EXT_TABLES.sql

@@ -13,7 +13,8 @@ FROM
     ON TABLES.OWNER = USERS.USERNAME
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
-      AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')  
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(TABLES.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(TABLES.OWNER || '.' || TABLES.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/EXT_TABLE_CONSTRAINTS.sql

@@ -12,6 +12,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(CONSTRAINTS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(CONSTRAINTS.OWNER || '.' || CONSTRAINTS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/FOREIGN_KEYS.sql

@@ -37,6 +37,7 @@ WHERE
   AND USERS.ORACLE_MAINTAINED = 'N'
   AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
   AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+  AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
   AND P.CONSTRAINT_TYPE IN ('P', 'U')
   AND F.CONSTRAINT_TYPE = 'R'
 ORDER BY

schemacrawler-oracle/src/main/resources/oracle.information_schema/FUNCTIONS.sql

@@ -19,6 +19,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(FUNCTIONS.OWNER, '${schema-inclusion-rule}')
   AND FUNCTIONS.OBJECT_TYPE = 'FUNCTION'

schemacrawler-oracle/src/main/resources/oracle.information_schema/FUNCTION_COLUMNS.sql

@@ -82,6 +82,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(COLUMNS.OWNER, '${schema-inclusion-rule}')
   AND COLUMNS.OBJECT_NAME NOT LIKE 'BIN$%'

schemacrawler-oracle/src/main/resources/oracle.information_schema/INDEXES.sql

@@ -25,6 +25,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(INDEXES.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(INDEXES.OWNER || '.' || INDEXES.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/PRIMARY_KEYS.sql

@@ -23,6 +23,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(PRIMARY_KEYS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(PRIMARY_KEYS.OWNER || '.' || PRIMARY_KEYS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/PROCEDURES.sql

@@ -19,6 +19,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(PROCEDURES.OWNER, '${schema-inclusion-rule}')
   AND PROCEDURES.OBJECT_TYPE = 'PROCEDURE'

schemacrawler-oracle/src/main/resources/oracle.information_schema/PROCEDURE_COLUMNS.sql

@@ -82,6 +82,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(COLUMNS.OWNER, '${schema-inclusion-rule}')
   AND COLUMNS.OBJECT_NAME NOT LIKE 'BIN$%'

schemacrawler-oracle/src/main/resources/oracle.information_schema/ROUTINES.sql

@@ -13,6 +13,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(PROCEDURES.OWNER, '${schema-inclusion-rule}')
 ORDER BY

schemacrawler-oracle/src/main/resources/oracle.information_schema/SEQUENCES.sql

@@ -17,6 +17,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(SEQUENCES.SEQUENCE_OWNER, '${schema-inclusion-rule}')
 ORDER BY

schemacrawler-oracle/src/main/resources/oracle.information_schema/TABLES.sql

@@ -11,6 +11,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(TABLES.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(TABLES.OWNER || '.' || TABLES.TABLE_NAME, '${table-inclusion-rule}')
@@ -30,6 +31,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(MVIEWS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(MVIEWS.OWNER || '.' || MVIEWS.MVIEW_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/TABLE_COLUMNS.sql

@@ -83,6 +83,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(COLUMNS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(COLUMNS.OWNER || '.' || COLUMNS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/TABLE_CONSTRAINTS.sql

@@ -18,6 +18,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(CONSTRAINTS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(CONSTRAINTS.OWNER || '.' || CONSTRAINTS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/TRIGGERS.sql

@@ -29,6 +29,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(TRIGGERS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(TRIGGERS.OWNER || '.' || TRIGGERS.TABLE_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/VIEWS.sql

@@ -12,6 +12,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(VIEWS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(VIEWS.OWNER || '.' || VIEWS.VIEW_NAME, '${table-inclusion-rule}')
@@ -32,6 +33,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   REGEXP_LIKE(MVIEWS.OWNER, '${schema-inclusion-rule}')
   AND REGEXP_LIKE(MVIEWS.OWNER || '.' || MVIEWS.MVIEW_NAME, '${table-inclusion-rule}')

schemacrawler-oracle/src/main/resources/oracle.information_schema/VIEW_TABLE_USAGE.sql

@@ -12,6 +12,7 @@ FROM
       AND USERS.ORACLE_MAINTAINED = 'N'
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^APEX_[0-9]{6}$')
       AND NOT REGEXP_LIKE(USERS.USERNAME, '^FLOWS_[0-9]{5}$')
+      AND NOT REGEXP_LIKE(USERS.USERNAME, '^OPS\$ORACLE$')
 WHERE
   VIEW_TABLE_USAGE.TYPE = 'VIEW'
   AND REGEXP_LIKE(VIEW_TABLE_USAGE.OWNER, '${schema-inclusion-rule}')

schemacrawler-oracle/src/test/java/schemacrawler/integration/test/OracleSpecialUsersTest.java

@@ -93,7 +93,7 @@ public void testOracleSelectCatalogRoleUser() throws Exception {
         DatabaseConnectionSources.fromDataSource(catalogUserDataSource);
     final String expectedResource =
         String.format("testOracleSelectCatalogRoleUser.%s.txt", javaVersion());
-    testOracleWithConnection(dataSource, expectedResource, 34, true);
+    testOracleWithConnection(dataSource, expectedResource, 33, true);
 
     final DatabaseAccessException sqlException =
         assertThrows(
@@ -127,7 +127,7 @@ public void testOracleWithNoAccessUser() throws Exception {
         DatabaseConnectionSources.fromDataSource(noAccessUserDataSource);
     final String expectedResource =
         String.format("testOracleWithNoAccessUser.%s.txt", javaVersion());
-    testOracleWithConnection(dataSource, expectedResource, 34, false);
+    testOracleWithConnection(dataSource, expectedResource, 33, false);
 
     final DatabaseAccessException sqlException =
         assertThrows(
@@ -151,7 +151,7 @@ public void testOracleWithSchemaOwnerUser() throws Exception {
         DatabaseConnectionSources.fromDataSource(schemaOwnerUserDataSource);
     final String expectedResource =
         String.format("testOracleWithSchemaOwnerUser.%s.txt", javaVersion());
-    testOracleWithConnection(dataSource, expectedResource, 34, true);
+    testOracleWithConnection(dataSource, expectedResource, 33, true);
 
     testSelectQuery(dataSource, "testOracleWithConnectionQuery.txt");
 
@@ -169,7 +169,7 @@ public void testOracleWithSelectGrantUser() throws Exception {
 
     final String expectedResource =
         String.format("testOracleWithSelectGrantUser.%s.txt", javaVersion());
-    testOracleWithConnection(dataSource, expectedResource, 34, true);
+    testOracleWithConnection(dataSource, expectedResource, 33, true);
 
     testSelectQuery(dataSource, "testOracleWithConnectionQuery.txt");
 

schemacrawler-oracle/src/test/java/schemacrawler/integration/test/OracleTest.java

@@ -83,7 +83,7 @@ public void testOracleWithConnection() throws Exception {
     final DatabaseConnectionSource dataSource = getDataSource();
 
     final String expectedResource = String.format("testOracleWithConnection.%s.txt", javaVersion());
-    testOracleWithConnection(dataSource, expectedResource, 34, false);
+    testOracleWithConnection(dataSource, expectedResource, 33, false);
 
     testSelectQuery(dataSource, "testOracleWithConnectionQuery.txt");
   }