fixed NPE when search_path contains quoted schema (patch by Steven El…

…liott, bug #3506644)
ellmkay · Jun 1, 2012 · d7707da · d7707da
1 parent 48c22bc
commit d7707da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -10,6 +10,7 @@ Fixes
 * Fixed issue with comments not being added on newly created columns.
 * Improved logging errors when parsing strings.
 * Added support for IF NOT EXISTS (patch by Felipe Sateler).
+* Fixed NPE when search_path contains quoted schema (patch by Steven Elliott).
 
 -----------------------
 2010-10-22: Version 2.3

diff --git a/src/main/java/cz/startnet/utils/pgdiff/loader/PgDumpLoader.java b/src/main/java/cz/startnet/utils/pgdiff/loader/PgDumpLoader.java
@@ -47,7 +47,7 @@ public class PgDumpLoader { //NOPMD
      */
     private static final Pattern PATTERN_DEFAULT_SCHEMA =
             Pattern.compile(
-            "^SET[\\s]+search_path[\\s]*=[\\s]*([^,\\s]+)(?:,[\\s]+.*)?;$",
+            "^SET[\\s]+search_path[\\s]*=[\\s]*\"?([^,\\s\"]+)\"?(?:,[\\s]+.*)?;$",
             Pattern.CASE_INSENSITIVE);
     /**
      * Pattern for testing whether it is CREATE TABLE statement.