Add --ignore-constraint-names option

pom.xml

@@ -221,6 +221,16 @@
             <version>1.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+        	<groupId>org.apache.commons</groupId>
+        	<artifactId>commons-lang3</artifactId>
+        	<version>3.5</version>
+        </dependency>
+        <dependency>
+	    	<groupId>org.apache.commons</groupId>
+    		<artifactId>commons-collections4</artifactId>
+    		<version>4.1</version>
+		</dependency>
     </dependencies>
 
     <reporting>

src/main/java/cz/startnet/utils/pgdiff/PgDiff.java

@@ -6,10 +6,19 @@
 package cz.startnet.utils.pgdiff;
 
 import cz.startnet.utils.pgdiff.loader.PgDumpLoader;
+import cz.startnet.utils.pgdiff.schema.PgColumnConstraint;
+import cz.startnet.utils.pgdiff.schema.PgConstraint;
 import cz.startnet.utils.pgdiff.schema.PgDatabase;
+import cz.startnet.utils.pgdiff.schema.PgFkConstraint;
+import cz.startnet.utils.pgdiff.schema.PgPkConstraint;
 import cz.startnet.utils.pgdiff.schema.PgSchema;
+import cz.startnet.utils.pgdiff.schema.PgTable;
+
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Creates diff of two database schemas.
@@ -230,9 +239,9 @@ private static void updateSchemas(final PrintWriter writer,
             PgDiffViews.dropViews(
                     writer, oldSchema, newSchema, searchPathHelper);
             PgDiffConstraints.dropConstraints(
-                    writer, oldSchema, newSchema, true, searchPathHelper);
+                    writer, arguments, oldSchema, newSchema, true, searchPathHelper);
             PgDiffConstraints.dropConstraints(
-                    writer, oldSchema, newSchema, false, searchPathHelper);
+                    writer, arguments, oldSchema, newSchema, false, searchPathHelper);
             PgDiffIndexes.dropIndexes(
                     writer, oldSchema, newSchema, searchPathHelper);
             PgDiffTables.dropClusters(
@@ -242,22 +251,34 @@ private static void updateSchemas(final PrintWriter writer,
             PgDiffSequences.dropSequences(
                     writer, oldSchema, newSchema, searchPathHelper);
 
+            Map<PgTable,PgPkConstraint> pkConstraints =
+            		arguments.isInlinePrimaryKeys()
+            		? PgDiffConstraints.getPKConstraints(arguments, oldSchema, newSchema)
+            		: null;
+
+            Map<PgTable,Map<Set<String>,PgFkConstraint>> fkConstraints =
+               		arguments.isInlineForeignKeys()
+            		? PgDiffConstraints.getFKConstraints(arguments, oldSchema, newSchema)
+            		: null;
+
             PgDiffSequences.createSequences(
                     writer, oldSchema, newSchema, searchPathHelper);
             PgDiffSequences.alterSequences(
                     writer, arguments, oldSchema, newSchema, searchPathHelper);
             PgDiffTables.createTables(
-                    writer, oldSchema, newSchema, searchPathHelper);
+                    writer, oldSchema, newSchema, searchPathHelper, pkConstraints, fkConstraints);
             PgDiffTables.alterTables(
                     writer, arguments, oldSchema, newSchema, searchPathHelper);
             PgDiffSequences.alterCreatedSequences(
                     writer, oldSchema, newSchema, searchPathHelper);
             PgDiffFunctions.createFunctions(
                     writer, arguments, oldSchema, newSchema, searchPathHelper);
             PgDiffConstraints.createConstraints(
-                    writer, oldSchema, newSchema, true, searchPathHelper);
+                    writer, arguments, oldSchema, newSchema, PgDiffConstraints.PRIMARY_KEYS, searchPathHelper);
+            PgDiffConstraints.createConstraints(
+                    writer, arguments, oldSchema, newSchema, PgDiffConstraints.FOREIGN_KEYS, searchPathHelper);
             PgDiffConstraints.createConstraints(
-                    writer, oldSchema, newSchema, false, searchPathHelper);
+                    writer, arguments, oldSchema, newSchema, PgDiffConstraints.OTHER_CONSTRAINTS, searchPathHelper);
             PgDiffIndexes.createIndexes(
                     writer, oldSchema, newSchema, searchPathHelper);
             PgDiffTables.createClusters(

src/main/java/cz/startnet/utils/pgdiff/PgDiffArguments.java

@@ -65,8 +65,26 @@ public class PgDiffArguments {
      * Whether Slony triggers should be ignored.
      */
     private boolean ignoreSlonyTriggers;
+    /**
+     * Whether to ignore constraint names differences
+     */
+    private boolean ignoreConstraintNames;
+    /**
+     * Wether to generate primary key constraints in the CREATE TABLE statement if possible
+     */
+    private boolean inlinePrimaryKeys;
+
+    /**
+     * Wether to generate foriegn key constraints in the CREATE TABLE statement if possible
+     */
+    private boolean inlineForeignKeys;
 
     /**
+     * Wether to group ALTER TABLE statements for the same table into one statement
+     */
+    private boolean groupAlterTables;
+
+	/**
      * Setter for {@link #addDefaults}.
      *
      * @param addDefaults {@link #addDefaults}
@@ -253,6 +271,17 @@ public boolean parse(final PrintWriter writer, final String[] args) {
                 i++;
             } else if ("--output-ignored-statements".equals(args[i])) {
                 setOutputIgnoredStatements(true);
+            } else if ("--ignore-constraint-names".equals(args[i])) {
+                setIgnoreConstraintNames(true);
+            } else if ("--inline-primary-keys".equals(args[i])) {
+                setInlinePrimaryKeys(true);
+            } else if ("--inline-foreign-keys".equals(args[i])) {
+                setInlineForeignKeys(true);
+            } else if ("--inline-constraints".equals(args[i])) {
+                setInlinePrimaryKeys(true);
+                setInlineForeignKeys(true);
+            } else if ("--group-alter-tables".equals(args[i])) {
+                setGroupAlterTables(true);
             } else if ("--version".equals(args[i])) {
                 setVersion(true);
             } else {
@@ -387,4 +416,33 @@ public boolean isIgnoreSlonyTriggers() {
     public void setIgnoreSlonyTriggers(final boolean ignoreSlonyTriggers) {
         this.ignoreSlonyTriggers = ignoreSlonyTriggers;
     }
+
+    public boolean isIgnoreConstraintNames() {
+		return ignoreConstraintNames;
+	}
+
+	public void setIgnoreConstraintNames(boolean ignoreConstraintNames) {
+		this.ignoreConstraintNames = ignoreConstraintNames;
+	}
+
+	public boolean isInlinePrimaryKeys() {
+		return inlinePrimaryKeys;
+	}
+	public void setInlinePrimaryKeys(boolean inlinePrimaryKeys) {
+		this.inlinePrimaryKeys = inlinePrimaryKeys;
+	}
+
+	public boolean isInlineForeignKeys() {
+		return inlineForeignKeys;
+	}
+	public void setInlineForeignKeys(boolean inlineForeignKeys) {
+		this.inlineForeignKeys = inlineForeignKeys;
+	}
+
+	public boolean isGroupAlterTables() {
+		return groupAlterTables;
+	}
+	public void setGroupAlterTables(boolean groupAlterTables) {
+		this.groupAlterTables = groupAlterTables;
+	}
 }