Merge branch 'version-11' into 'master'

version 11

See merge request codekeeper/pgcodekeeper-cli!6

Author: baslo2

.gitattributes

@@ -0,0 +1 @@
+src/test/resources/** linguist-vendored

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.pgcodekeeper</groupId>
     <artifactId>pgcodekeeper-cli</artifactId>
-    <version>11.0.0-rc.1</version>
+    <version>11.0.0</version>
     <packaging>jar</packaging>
 
     <name>pgcodekeeper-cli</name>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.pgcodekeeper</groupId>
             <artifactId>pgcodekeeper-core</artifactId>
-            <version>11.0.0-rc.1</version>
+            <version>11.0.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

src/main/java/org/pgcodekeeper/cli/Application.java

@@ -19,33 +19,33 @@
  *******************************************************************************/
 package org.pgcodekeeper.cli;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.kohsuke.args4j.CmdLineException;
 import org.pgcodekeeper.cli.localizations.Messages;
+import org.pgcodekeeper.core.DangerStatement;
 import org.pgcodekeeper.core.PgCodekeeperException;
-import org.pgcodekeeper.core.UnixPrintWriter;
 import org.pgcodekeeper.core.loader.JdbcRunner;
 import org.pgcodekeeper.core.loader.TokenLoader;
 import org.pgcodekeeper.core.loader.UrlJdbcConnector;
 import org.pgcodekeeper.core.model.graph.DepcyFinder;
 import org.pgcodekeeper.core.model.graph.InsertWriter;
-import org.pgcodekeeper.core.parsers.antlr.ScriptParser;
+import org.pgcodekeeper.core.parsers.antlr.base.ScriptParser;
 import org.pgcodekeeper.core.schema.AbstractDatabase;
 import org.pgcodekeeper.core.utils.FileUtils;
-import org.pgcodekeeper.core.DangerStatement;
+import org.pgcodekeeper.core.utils.UnixPrintWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Compares two PostgreSQL dumps and outputs information about differences in
  * the database schemas.

src/main/java/org/pgcodekeeper/cli/CliArgs.java

@@ -413,7 +413,7 @@ public boolean isIgnoreColumnOrder() {
     }
 
     @Override
-    public boolean isConstraintNotValid() {
+    public boolean isGenerateConstraintNotValid() {
         return generateConstraintNotValid;
     }
 

src/main/java/org/pgcodekeeper/cli/PgDiffCli.java

@@ -19,27 +19,22 @@
 import org.pgcodekeeper.cli.localizations.Messages;
 import org.pgcodekeeper.core.PgCodekeeperException;
 import org.pgcodekeeper.core.PgDiff;
-import org.pgcodekeeper.core.ignoreparser.IgnoreParser;
-import org.pgcodekeeper.core.loader.*;
-import org.pgcodekeeper.core.model.difftree.DiffTree;
-import org.pgcodekeeper.core.model.difftree.IgnoreList;
-import org.pgcodekeeper.core.model.difftree.IgnoreSchemaList;
-import org.pgcodekeeper.core.model.difftree.TreeElement;
-import org.pgcodekeeper.core.model.exporter.ModelExporter;
+import org.pgcodekeeper.core.api.DatabaseFactory;
+import org.pgcodekeeper.core.api.PgCodeKeeperApi;
+import org.pgcodekeeper.core.loader.FullAnalyze;
+import org.pgcodekeeper.core.loader.LibraryLoader;
+import org.pgcodekeeper.core.loader.ProjectLoader;
 import org.pgcodekeeper.core.schema.AbstractDatabase;
 import org.pgcodekeeper.core.schema.PgOverride;
-import org.pgcodekeeper.core.utils.ProjectUpdater;
 import org.pgcodekeeper.core.xmlstore.DependenciesXmlStore;
 
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.List;
 
-
 public final class PgDiffCli extends PgDiff {
 
-
     private final CliArgs arguments;
 
     public PgDiffCli(CliArgs arguments) {
@@ -49,51 +44,22 @@ public PgDiffCli(CliArgs arguments) {
 
     public void updateProject()
             throws IOException, InterruptedException, PgCodekeeperException {
-
         AbstractDatabase oldDatabase = loadOldDatabaseWithLibraries();
         AbstractDatabase newDatabase = loadNewDatabaseWithLibraries();
-        IgnoreList ignoreList = getIgnoreList();
-        TreeElement root = DiffTree.create(oldDatabase, newDatabase, null);
-        root.setAllChecked();
 
-        List<TreeElement> selected = getSelectedElements(root, ignoreList);
-
-        new ProjectUpdater(newDatabase, oldDatabase, selected, arguments.getDbType(),
-                arguments.getOutCharsetName(), Paths.get(arguments.getOutputTarget()),
-                false, settings).updatePartial();
+        PgCodeKeeperApi.update(settings, oldDatabase, newDatabase,
+                arguments.getOutputTarget(), arguments.getIgnoreLists(), null);
     }
 
     public void exportProject() throws IOException, InterruptedException, PgCodekeeperException {
         AbstractDatabase newDb = loadNewDatabase();
-        TreeElement root = DiffTree.create(newDb, null, null);
-        root.setAllChecked();
-
-        IgnoreList ignoreList = getIgnoreList();
-        List<TreeElement> selected = getSelectedElements(root, ignoreList);
-        new ModelExporter(Paths.get(arguments.getOutputTarget()), newDb, null,
-                arguments.getDbType(), selected, arguments.getOutCharsetName(), settings).exportProject();
-    }
-
-    private IgnoreList getIgnoreList() throws IOException {
-        IgnoreList ignoreList = new IgnoreList();
-        IgnoreParser ignoreParser = new IgnoreParser(ignoreList);
-        for (String listFilename : arguments.getIgnoreLists()) {
-            ignoreParser.parse(Paths.get(listFilename));
-        }
-        return ignoreList;
+        PgCodeKeeperApi.export(settings, newDb, arguments.getOutputTarget(), arguments.getIgnoreLists(), null);
     }
 
     public String createDiff() throws InterruptedException, IOException, PgCodekeeperException {
         AbstractDatabase oldDatabase = loadOldDatabaseWithLibraries();
         AbstractDatabase newDatabase = loadNewDatabaseWithLibraries();
-        IgnoreList ignoreList = new IgnoreList();
-        IgnoreParser ignoreParser = new IgnoreParser(ignoreList);
-
-        for (String listFilename : arguments.getIgnoreLists()) {
-            ignoreParser.parse(Paths.get(listFilename));
-        }
-
-        return diff(oldDatabase, newDatabase, ignoreList);
+        return PgCodeKeeperApi.diff(settings, oldDatabase, newDatabase, arguments.getIgnoreLists());
     }
 
     public AbstractDatabase loadNewDatabaseWithLibraries()
@@ -176,16 +142,12 @@ private void loadLibraries(AbstractDatabase db, Collection<String> libXmls, Coll
 
     private AbstractDatabase loadNewDatabase()
             throws IOException, InterruptedException, PgCodekeeperException {
-        AbstractDatabase db = loadDatabaseSchema(arguments.getNewSrcFormat(), arguments.getNewSrc());
-        assertErrors();
-        return db;
+        return loadDatabaseSchema(arguments.getNewSrcFormat(), arguments.getNewSrc());
     }
 
     private AbstractDatabase loadOldDatabase()
             throws IOException, InterruptedException, PgCodekeeperException {
-        AbstractDatabase db = loadDatabaseSchema(arguments.getOldSrcFormat(), arguments.getOldSrc());
-        assertErrors();
-        return db;
+        return loadDatabaseSchema(arguments.getOldSrcFormat(), arguments.getOldSrc());
     }
 
     /**
@@ -198,24 +160,13 @@ private AbstractDatabase loadOldDatabase()
      * @return the loaded database
      */
     private AbstractDatabase loadDatabaseSchema(SourceFormat format, String srcPath)
-            throws InterruptedException, IOException {
-        LOG.info(Messages.PgDiffCli_log_load_ignored_schemas);
-        IgnoreSchemaList ignoreSchemaList = new IgnoreSchemaList();
-        IgnoreParser ignoreParser = new IgnoreParser(ignoreSchemaList);
-        if (arguments.getIgnoreSchemaList() != null) {
-            ignoreParser.parse(Paths.get(arguments.getIgnoreSchemaList()));
-        }
-        DatabaseLoader loader = switch (format) {
-        case DB -> LoaderFactory.createJdbcLoader(settings, srcPath, ignoreSchemaList);
-        case DUMP -> new PgDumpLoader(Paths.get(srcPath), settings);
-        case PARSED -> new ProjectLoader(srcPath, settings, null, errors, ignoreSchemaList);
+            throws InterruptedException, IOException, PgCodekeeperException {
+        var factory = new DatabaseFactory(settings, arguments.isIgnoreErrors(), false);
+        return switch (format) {
+        case DB -> factory.loadFromJdbc(srcPath, arguments.getIgnoreSchemaList());
+        case DUMP -> factory.loadFromDump(srcPath);
+        case PARSED -> factory.loadFromProject(srcPath, arguments.getIgnoreSchemaList());
         };
-
-        try {
-            return loader.load();
-        } finally {
-            errors.addAll(loader.getErrors());
-        }
     }
 
     private void assertErrors() throws PgCodekeeperException {