From 4db4ffb0190ddf8c69e63eb7547db8f323c0b14c Mon Sep 17 00:00:00 2001 From: Marc Cousin Date: Tue, 3 Mar 2020 15:12:45 +0100 Subject: [PATCH 1/2] Ugly fix for null pointer exception --- .../java/cz/startnet/utils/pgdiff/PgDiffViews.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java b/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java index 26965827..d1cab0d6 100755 --- a/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java +++ b/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java @@ -33,7 +33,15 @@ public static void createViews(final PrintWriter writer, final PgSchema oldSchema, final PgSchema newSchema, final SearchPathHelper searchPathHelper) { for (final PgView newView : newSchema.getViews()) { - final PgView oldView = oldSchema.getView(newView.getName()); + PgView oldView; + if (oldSchema != null) + { + oldView = oldSchema.getView(newView.getName()); + } + else + { + oldView = null; + } if (oldSchema == null || !oldSchema.containsView(newView.getName()) || isViewModified(oldView, newView)) { From f579ad741cc9812e3ced1990cde895f3be167290 Mon Sep 17 00:00:00 2001 From: Marc Cousin Date: Thu, 5 Mar 2020 14:13:17 +0100 Subject: [PATCH 2/2] Improve code's readability --- .../java/cz/startnet/utils/pgdiff/PgDiffViews.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java b/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java index d1cab0d6..97cd01db 100755 --- a/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java +++ b/src/main/java/cz/startnet/utils/pgdiff/PgDiffViews.java @@ -33,15 +33,7 @@ public static void createViews(final PrintWriter writer, final PgSchema oldSchema, final PgSchema newSchema, final SearchPathHelper searchPathHelper) { for (final PgView newView : newSchema.getViews()) { - PgView oldView; - if (oldSchema != null) - { - oldView = oldSchema.getView(newView.getName()); - } - else - { - oldView = null; - } + PgView oldView = (oldSchema == null ? null : oldSchema.getView(newView.getName())); if (oldSchema == null || !oldSchema.containsView(newView.getName()) || isViewModified(oldView, newView)) { @@ -85,7 +77,7 @@ public static void createViews(final PrintWriter writer, * @param writer writer the output should be written to * @param oldSchema original schema * @param newSchema new schema - * @param searchPathHelper search path helper + * @param searchPathHelper search path helper */ public static void dropViews(final PrintWriter writer, final PgSchema oldSchema, final PgSchema newSchema,