Add tests for pull request #129

Refactoring Update README
fordfrog · Mar 28, 2016 · 35ed1d7 · 35ed1d7
1 parent 96d2377
commit 35ed1d7
Show file tree

Hide file tree

Showing 29 changed files with 432 additions and 288 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ [email protected].
 * Added support for CREATE UNLOGGED TABLE (Anatoliy Basov)
 * Added support for /**/ comments (yulei)
 * Support of triggers for views + clause 'INSTEAD OF' (Sergej Bonich)
+* Add support for GRANT and REVOKE on objects: table, view, sequence, column (serge-pouliquen-itf)
+* Add support for ALTER TABLE ... OWNER TO (serge-pouliquen-itf)
 
 #### Fixes
 * Added hint to use "CREATE TABLE ... CONSTRAINT name PRIMARY KEY/UNIQUE ..."

diff --git a/src/main/java/cz/startnet/utils/pgdiff/Main.java b/src/main/java/cz/startnet/utils/pgdiff/Main.java
@@ -5,27 +5,25 @@
  */
 package cz.startnet.utils.pgdiff;
 
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 
 /**
  * Compares two PostgreSQL dumps and outputs information about differences in
  * the database schemas.
- * 
+ *
  * @author fordfrog
  */
 public class Main {
 
     /**
      * APgDiff main method.
-     * 
-     * @param args
-     *            the command line arguments
-     * 
-     * @throws UnsupportedEncodingException
-     *             Thrown if unsupported output encoding has been encountered.
+     *
+     * @param args the command line arguments
+     *
+     * @throws UnsupportedEncodingException Thrown if unsupported output
+     *                                      encoding has been encountered.
      */
     public static void main(final String[] args)
             throws UnsupportedEncodingException {
@@ -34,39 +32,15 @@ public static void main(final String[] args)
         final PgDiffArguments arguments = new PgDiffArguments();
 
         if (arguments.parse(writer, args)) {
-            // localvar in case of print
             @SuppressWarnings("UseOfSystemOutOrSystemErr")
             final PrintWriter encodedWriter = new PrintWriter(
-                    new OutputStreamWriter(System.out,
-                            arguments.getOutCharsetName()) {
-                        @Override
-                        public void write(int c) throws IOException {
-                            PgDiff.hasPrint = true;
-                            super.write(c);
-                        }
-
-                        @Override
-                        public void write(char cbuf[], int off, int len)
-                                throws IOException {
-                            PgDiff.hasPrint = true;
-                            super.write(cbuf, off, len);
-                        }
-
-                        @Override
-                        public void write(String str, int off, int len)
-                                throws IOException {
-                            PgDiff.hasPrint = true;
-                            super.write(str, off, len);
-                        }
-                    });
+                    new OutputStreamWriter(
+                    System.out, arguments.getOutCharsetName()));
             PgDiff.createDiff(encodedWriter, arguments);
             encodedWriter.close();
         }
 
         writer.close();
-        if (PgDiff.isDifferent) {
-            System.exit(1);
-        }
     }
 
     /**

diff --git a/src/main/java/cz/startnet/utils/pgdiff/PgDiff.java b/src/main/java/cz/startnet/utils/pgdiff/PgDiff.java
@@ -110,9 +110,6 @@ private static void diffDatabaseSchemas(final PrintWriter writer,
             writer.println("START TRANSACTION;");
         }
 
-        hasPrint = false;
-        isDifferent = false;
-
         if (oldDatabase.getComment() == null
                 && newDatabase.getComment() != null
                 || oldDatabase.getComment() != null
@@ -132,10 +129,6 @@ private static void diffDatabaseSchemas(final PrintWriter writer,
         createNewSchemas(writer, oldDatabase, newDatabase);
         updateSchemas(writer, arguments, oldDatabase, newDatabase);
 
-        if (hasPrint) {
-            isDifferent = true;
-        }
-
         if (arguments.isAddTransaction()) {
             writer.println();
             writer.println("COMMIT TRANSACTION;");

diff --git a/src/main/java/cz/startnet/utils/pgdiff/PgDiffTables.java b/src/main/java/cz/startnet/utils/pgdiff/PgDiffTables.java
@@ -11,7 +11,7 @@
 import cz.startnet.utils.pgdiff.schema.PgInheritedColumn;
 import cz.startnet.utils.pgdiff.schema.PgSchema;
 import cz.startnet.utils.pgdiff.schema.PgTable;
-import cz.startnet.utils.pgdiff.schema.PgTablePrivilege;
+import cz.startnet.utils.pgdiff.schema.PgRelationPrivilege;
 import java.io.PrintWriter;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -546,7 +546,7 @@ public static void createTables(final PrintWriter writer,
                             + PgDiffUtils.getQuotedName(table.getName())
                             + " OWNER TO " + table.getOwnerTo() + ";");
                 }
-                for (PgTablePrivilege tablePrivilege : table.getPrivileges()) {
+                for (PgRelationPrivilege tablePrivilege : table.getPrivileges()) {
                     writer.println("REVOKE ALL ON TABLE "
                             + PgDiffUtils.getQuotedName(table.getName())
                             + " FROM " + tablePrivilege.getRoleName() + ";");
@@ -792,8 +792,8 @@ private static void alterPrivileges(final PrintWriter writer,
             final PgTable oldTable, final PgTable newTable,
             final SearchPathHelper searchPathHelper) {
         boolean emptyLinePrinted = false;
-        for (PgTablePrivilege oldTablePrivilege : oldTable.getPrivileges()) {
-            PgTablePrivilege newTablePrivilege = newTable
+        for (PgRelationPrivilege oldTablePrivilege : oldTable.getPrivileges()) {
+            PgRelationPrivilege newTablePrivilege = newTable
                     .getPrivilege(oldTablePrivilege.getRoleName());
             if (newTablePrivilege == null) {
                 if (!emptyLinePrinted) {
@@ -828,8 +828,8 @@ private static void alterPrivileges(final PrintWriter writer,
                 }
             } // else similar privilege will not be updated
         }
-        for (PgTablePrivilege newTablePrivilege : newTable.getPrivileges()) {
-            PgTablePrivilege oldTablePrivilege = oldTable
+        for (PgRelationPrivilege newTablePrivilege : newTable.getPrivileges()) {
+            PgRelationPrivilege oldTablePrivilege = oldTable
                     .getPrivilege(newTablePrivilege.getRoleName());
             if (oldTablePrivilege == null) {
                 if (!emptyLinePrinted) {

diff --git a/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java b/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java
@@ -8,7 +8,7 @@
 import cz.startnet.utils.pgdiff.schema.PgColumn;
 import cz.startnet.utils.pgdiff.schema.PgSchema;
 import cz.startnet.utils.pgdiff.schema.PgView;
-import cz.startnet.utils.pgdiff.schema.PgViewPrivilege;
+import cz.startnet.utils.pgdiff.schema.PgRelationPrivilege;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +40,7 @@ public static void createViews(final PrintWriter writer,
                 writer.println();
                 writer.println(newView.getCreationSQL());
 
-                for (PgViewPrivilege viewPrivilege : newView.getPrivileges()) {
+                for (PgRelationPrivilege viewPrivilege : newView.getPrivileges()) {
                     writer.println("REVOKE ALL ON TABLE "
                             + PgDiffUtils.getQuotedName(newView.getName())
                             + " FROM " + viewPrivilege.getRoleName() + ";");
@@ -289,8 +289,8 @@ private static void alterPrivileges(final PrintWriter writer,
             final PgView oldView, final PgView newView,
             final SearchPathHelper searchPathHelper) {
         boolean emptyLinePrinted = false;
-        for (PgViewPrivilege oldViewPrivilege : oldView.getPrivileges()) {
-            PgViewPrivilege newViewPrivilege = newView
+        for (PgRelationPrivilege oldViewPrivilege : oldView.getPrivileges()) {
+            PgRelationPrivilege newViewPrivilege = newView
                     .getPrivilege(oldViewPrivilege.getRoleName());
             if (newViewPrivilege == null) {
                 if (!emptyLinePrinted) {
@@ -323,8 +323,8 @@ private static void alterPrivileges(final PrintWriter writer,
                 }
             } // else similar privilege will not be updated
         }
-        for (PgViewPrivilege newViewPrivilege : newView.getPrivileges()) {
-            PgViewPrivilege oldViewPrivilege = oldView
+        for (PgRelationPrivilege newViewPrivilege : newView.getPrivileges()) {
+            PgRelationPrivilege oldViewPrivilege = oldView
                     .getPrivilege(newViewPrivilege.getRoleName());
             if (oldViewPrivilege == null) {
                 if (!emptyLinePrinted) {

diff --git a/src/main/java/cz/startnet/utils/pgdiff/loader/PgDumpLoader.java b/src/main/java/cz/startnet/utils/pgdiff/loader/PgDumpLoader.java
@@ -358,7 +358,7 @@ private static void stripComment(final StringBuilder sbStatement) {
 
             pos = sbStatement.indexOf("--", pos + 1);
         }
-
+        
         int endPos = sbStatement.indexOf("*/");
         if (endPos >= 0) {
         	int startPos = sbStatement.indexOf("/*");

diff --git a/src/main/java/cz/startnet/utils/pgdiff/parsers/GrantRevokeParser.java b/src/main/java/cz/startnet/utils/pgdiff/parsers/GrantRevokeParser.java
@@ -18,9 +18,8 @@
 import cz.startnet.utils.pgdiff.schema.PgSequence;
 import cz.startnet.utils.pgdiff.schema.PgSequencePrivilege;
 import cz.startnet.utils.pgdiff.schema.PgTable;
-import cz.startnet.utils.pgdiff.schema.PgTablePrivilege;
+import cz.startnet.utils.pgdiff.schema.PgRelationPrivilege;
 import cz.startnet.utils.pgdiff.schema.PgView;
-import cz.startnet.utils.pgdiff.schema.PgViewPrivilege;
 
 /**
  * Parses GRANT statements.
@@ -198,10 +197,10 @@ public static void parse(final PgDatabase database, final String statement,
 
                 if (table != null) {
                     for (String roleName : roles) {
-                        PgTablePrivilege tablePrivilege = table
+                        PgRelationPrivilege tablePrivilege = table
                                 .getPrivilege(roleName);
                         if (tablePrivilege == null) {
-                            tablePrivilege = new PgTablePrivilege(roleName);
+                            tablePrivilege = new PgRelationPrivilege(roleName);
                             table.addPrivilege(tablePrivilege);
                         }
                         for (String priv : privileges) {
@@ -211,10 +210,10 @@ public static void parse(final PgDatabase database, final String statement,
                     }
                 } else if (view != null) {
                     for (String roleName : roles) {
-                        PgViewPrivilege viewPrivilege = view
+                        PgRelationPrivilege viewPrivilege = view
                                 .getPrivilege(roleName);
                         if (viewPrivilege == null) {
-                            viewPrivilege = new PgViewPrivilege(roleName);
+                            viewPrivilege = new PgRelationPrivilege(roleName);
                             view.addPrivilege(viewPrivilege);
                         }
                         for (String priv : privileges) {