From 63afa3ebdd23b21a068a5ebdd861e46875c8b289 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 25 Oct 2021 13:43:39 +0200
Subject: [PATCH] [jOOQ/jOOQ#12425] Fix regression in NullTreatment
 implementation

The splitting of window functions into individual classes has introduced
a regression in the implementation of NullTreatment in all non-Db2
implementations.
---
 jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java | 2 +-
 jOOQ/src/main/java/org/jooq/impl/FirstValue.java      | 2 +-
 jOOQ/src/main/java/org/jooq/impl/LastValue.java       | 2 +-
 jOOQ/src/main/java/org/jooq/impl/NthValue.java        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java b/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java
index a06e36ee18..2e1910bd29 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java
@@ -151,8 +151,8 @@ abstract class AbstractLeadLag<T> extends AbstractWindowFunction<T> {
 
 
 
-                acceptNullTreatment(ctx);
                 ctx.sql(')');
+                acceptNullTreatment(ctx);
                 break;
         }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FirstValue.java b/jOOQ/src/main/java/org/jooq/impl/FirstValue.java
index 88b11e401d..0dea4b7f30 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FirstValue.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FirstValue.java
@@ -78,8 +78,8 @@ final class FirstValue<T> extends AbstractWindowFunction<T> implements QOM.First
 
 
 
-                acceptNullTreatment(ctx);
                 ctx.sql(')');
+                acceptNullTreatment(ctx);
                 break;
         }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/LastValue.java b/jOOQ/src/main/java/org/jooq/impl/LastValue.java
index 3fc6cc61c2..569a50edd3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LastValue.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LastValue.java
@@ -78,8 +78,8 @@ final class LastValue<T> extends AbstractWindowFunction<T> implements QOM.LastVa
 
 
 
-                acceptNullTreatment(ctx);
                 ctx.sql(')');
+                acceptNullTreatment(ctx);
                 break;
         }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/NthValue.java b/jOOQ/src/main/java/org/jooq/impl/NthValue.java
index 514564a2ed..0ff4f54cea 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NthValue.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NthValue.java
@@ -81,9 +81,9 @@ final class NthValue<T> extends AbstractWindowFunction<T> implements QOM.NthValu
 
 
 
+                ctx.sql(')');
                 acceptFromFirstOrLast(ctx);
                 acceptNullTreatment(ctx);
-                ctx.sql(')');
                 break;
         }