Merge branch 'DBTOOLS-2138_fix_overrides_problem' into 'master'

DBTOOLS-2138 fixed overrides problem

See merge request codekeeper/pgcodekeeper-core!300

Author: AXEPOH

src/main/java/org/pgcodekeeper/core/database/base/loader/AbstractProjectLoader.java

@@ -129,7 +129,7 @@ private void loadFileOverrides(List<Path> overrideFiles, T db) throws Interrupte
             IMonitor.checkCancelled(getMonitor());
             AbstractDumpLoader<T> loader = createDumpLoader(file);
             loader.setOverridesMap(overrides);
-            loader.setMode(ParserListenerMode.SINGLE);
+            loader.setMode(ParserListenerMode.REF);
             loader.loadWithoutAnalyze(db, antlrTasks);
             dumpLoaders.add(loader);
         }

src/main/java/org/pgcodekeeper/core/database/pg/parser/PgOverridesListener.java

@@ -128,6 +128,9 @@ private void createSchema(Create_schema_statementContext ctx) {
         }
 
         PgSchema st = (PgSchema) getSafe(IDatabase::getSchema, db, ctx.name);
+        if (st == null) {
+            return;
+        }
         if (PgConsts.DEFAULT_SCHEMA.equals(st.getName()) && "postgres".equals(owner.getText())) {
             return;
         }
@@ -148,14 +151,19 @@ private void alterTable(Alter_table_statementContext ctx) {
             IdentifierContext name;
             if (owner != null && (name = owner.user_name().identifier()) != null) {
                 IRelation st = getSafe(ISchema::getRelation, schema, nameCtx);
-                overrides.computeIfAbsent((AbstractStatement) st,
-                        k -> new StatementOverride()).setOwner(name.getText());
+                if (st != null) {
+                    overrides.computeIfAbsent((AbstractStatement) st,
+                            k -> new StatementOverride()).setOwner(name.getText());
+                }
             }
         }
     }
 
     private <T extends IStatement, R extends IStatement> R getSafe(
             BiFunction<T, String, R> getter, T container, ParserRuleContext ctx) {
+        if (ParserListenerMode.REF == mode) {
+            return null;
+        }
         String name = ctx.getText();
         R statement = getter.apply(container, name);
         if (statement == null) {

src/test/java/org/pgcodekeeper/core/it/loader/pg/PgProjectLoaderTest.java

@@ -367,7 +367,7 @@ void testLoadFilesBatch(@TempDir Path dir) throws IOException, InterruptedExcept
     }
 
     @Test
-    void testLoadFilesAppliesOverrides(@TempDir Path dir) throws IOException, InterruptedException {
+    void testLoadFilesCollectsOverrideReferences(@TempDir Path dir) throws IOException, InterruptedException {
         Path projectDir = dir.resolve("project");
         createProject(projectDir, new CoreSettings());
         Path overrideDir = projectDir.resolve("OVERRIDES/SCHEMA/public/TABLE");
@@ -381,14 +381,12 @@ void testLoadFilesAppliesOverrides(@TempDir Path dir) throws IOException, Interr
 
         var emp = db.getStatement(new ObjectReference("public", "emp", DbObjType.TABLE));
         assertNotNull(emp);
-        Assertions.assertEquals("override_user", emp.getOwner());
-        assertTrue(emp.getPrivileges().stream().anyMatch(
-                p -> !p.isRevoke() && "SELECT".equals(p.getPermission()) && "override_user".equals(p.getRole())));
+        Assertions.assertNotEquals("override_user", emp.getOwner());
 
-        // an override file without the referenced object reports an error instead of being skipped
         var isolatedLoader = databaseProvider.getProjectLoader(projectDir, new CoreSettings());
-        isolatedLoader.loadFiles(List.of(overrideFile));
-        assertFalse(isolatedLoader.getErrors().isEmpty());
+        IDatabase isolatedDb = isolatedLoader.loadFiles(List.of(overrideFile));
+        assertTrue(isolatedLoader.getErrors().isEmpty(), isolatedLoader.getErrors().toString());
+        assertFalse(isolatedDb.getObjReferences().isEmpty());
     }
 
     @Test