From ef4f47454dec5e7eeef6c8399393d1379c89e98c Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 24 Mar 2017 23:30:41 +0100
Subject: [PATCH] [#5955] Various fixes

---
 jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index d5680f8ae3..33ee2235cc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -195,7 +195,6 @@ import static org.jooq.impl.ParserImpl.Type.S;
 import static org.jooq.impl.Tools.EMPTY_COLLECTION;
 import static org.jooq.impl.Tools.EMPTY_FIELD;
 import static org.jooq.impl.Tools.EMPTY_NAME;
-import static org.jooq.impl.Tools.EMPTY_STRING;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -736,7 +735,7 @@ class ParserImpl implements Parser {
         Field<?>[] fields = null;
 
         if (parseIf(ctx, '(')) {
-            fields = Tools.fieldsByName(parseIdentifiers(ctx).toArray(EMPTY_STRING));
+            fields = Tools.fieldsByName(parseIdentifiers(ctx).toArray(EMPTY_NAME));
             parse(ctx, ')');
         }
 
@@ -1059,7 +1058,7 @@ class ParserImpl implements Parser {
 
                     if (!defaultValue) {
                         if (parseKeywordIf(ctx, "DEFAULT")) {
-                            type = type.defaultValue((Field) parseField(ctx));
+                            type = type.defaultValue((Field) parseFieldConcat(ctx, null));
                             defaultValue = true;
                             continue;
                         }
@@ -1273,7 +1272,7 @@ class ParserImpl implements Parser {
 
                             if (!defaultValue) {
                                 if (parseKeywordIf(ctx, "DEFAULT")) {
-                                    type = type.defaultValue(parseField(ctx));
+                                    type = type.defaultValue(parseFieldConcat(ctx, null));
                                     defaultValue = true;
                                     continue;
                                 }
@@ -1850,7 +1849,7 @@ class ParserImpl implements Parser {
                 else {
                     parseKeyword(ctx, "USING");
                     parse(ctx, '(');
-                    result2 = result1.using(Tools.fieldsByName(parseIdentifiers(ctx).toArray(EMPTY_STRING)));
+                    result2 = result1.using(Tools.fieldsByName(parseIdentifiers(ctx).toArray(EMPTY_NAME)));
                     parse(ctx, ')');
                 }
 
@@ -2244,7 +2243,7 @@ class ParserImpl implements Parser {
                         return field;
 
                 if (parseKeywordIf(ctx, "PRIOR"))
-                    return prior(parseField(ctx));
+                    return prior(parseFieldConcat(ctx, type));
 
                 break;