fix exception on view without owner

subzerocloud · Aug 27, 2019 · 87fbf59 · 87fbf59
1 parent bb23559
commit 87fbf59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -1,6 +1,6 @@
 <project name="apgdiff" default="jar" basedir=".">
     <property name="name" value="Another PostgreSQL Diff Tool"/>
-    <property name="version" value="2.6.3-subzero"/>
+    <property name="version" value="2.6.4-subzero"/>
     <property name="build" value="build"/>
     <property name="dist" value="dist"/>
     <property name="build.output" value="${build}/classes"/>

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <groupId>cz.startnet</groupId>
     <artifactId>apgdiff</artifactId>
     <name>Another PostgreSQL Diff Tool</name>
-    <version>2.6.3-subzero</version>
+    <version>2.6.4-subzero</version>
     <description>Simple PostgreSQL diff tool that is useful for schema upgrades. The tool compares two schema dump files and creates output file that is (after some hand-made modifications) suitable for upgrade of old schema.</description>
 
     <url>http://www.apgdiff.com/</url>

diff --git a/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java b/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java
@@ -212,7 +212,13 @@ public static void alterViews(final PrintWriter writer,
                     writer.println(" IS NULL;");
                 }
             }
-            if (oldView.getOwnerTo() != null && !newView.getOwnerTo().equals(oldView.getOwnerTo())) {
+            if (
+                newView.getOwnerTo() != null && 
+                (
+                    oldView.getOwnerTo() == null ||
+                    !newView.getOwnerTo().equals(oldView.getOwnerTo())
+                )
+            ) {
                 writer.println();
                 writer.println("ALTER VIEW "
                         + PgDiffUtils.getQuotedName(newView.getName())