[#7405] Fixed regression

jOOQ · Jun 7, 2018 · 14896c0 · 14896c0
1 parent 940877c
commit 14896c0
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
@@ -69,8 +69,12 @@ public void accept(Context<?> ctx) {
             bind0((BindContext) ctx);
     }
 
-    final void toSQL0(RenderContext context) {
+    final void toSQL0(RenderContext ctx) {
-        switch (context.family()) {
+        ParamType paramType = ctx.paramType();
+        if (isInline())
+            ctx.paramType(INLINED);
+
+        switch (ctx.family()) {
 
 
 
@@ -108,21 +112,21 @@ final void toSQL0(RenderContext context) {
             // Due to lack of UDT support in the Postgres JDBC drivers, all UDT's
             // have to be inlined
             case POSTGRES: {
-                toSQLInline(context);
+                toSQLInline(ctx);
-                return;
+                break;
             }
 
             // Assume default behaviour if dialect is not available
             default:
-                toSQLInline(context);
+                toSQLInline(ctx);
-                return;
+                break;
         }
+
+        if (isInline())
+            ctx.paramType(paramType);
     }
 
     private final void toSQLInline(RenderContext ctx) {
-        ParamType previous = ctx.paramType();
-        ctx.paramType(ParamType.INLINED);
-
         switch (ctx.family()) {
 
 
@@ -152,13 +156,12 @@ private final void toSQLInline(RenderContext ctx) {
             separator = ", ";
         }
 
-        ctx.sql(')')
+        ctx.sql(')');
-           .paramType(previous);
     }
 
     @Deprecated
-    private final String getInlineConstructor(RenderContext context) {
+    private final String getInlineConstructor(RenderContext ctx) {
-        switch (context.family()) {
+        switch (ctx.family()) {
 
 
 
@@ -172,12 +175,12 @@ private final String getInlineConstructor(RenderContext context) {
 
             // Assume default behaviour if dialect is not available
             default:
-                return Tools.getMappedUDTName(context.configuration(), value);
+                return Tools.getMappedUDTName(ctx.configuration(), value);
         }
     }
 
-    final void bind0(BindContext context) {
+    final void bind0(BindContext ctx) {
-        switch (context.family()) {
+        switch (ctx.family()) {
 
 
 
@@ -195,13 +198,13 @@ final void bind0(BindContext context) {
             // inlined instead: ROW(.., .., ..)
             case POSTGRES: {
                 for (Field<?> field : value.fields())
-                    context.visit(val(value.get(field)));
+                    ctx.visit(val(value.get(field)));
 
                 break;
             }
 
             default:
-                throw new SQLDialectNotSupportedException("UDTs not supported in dialect " + context.dialect());
+                throw new SQLDialectNotSupportedException("UDTs not supported in dialect " + ctx.dialect());
         }
     }
 }