From 726d5261f90ddb37e39e9015781daa5b89da7d49 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Thu, 21 Dec 2017 11:02:50 +0100
Subject: [PATCH] [#6485] [#6931] Just a stylistic change...

---
 .../main/resources/org/jooq/web/grammar-3.11.txt   | 14 +++++++-------
 jOOQ/src/main/java/org/jooq/impl/ParserImpl.java   | 12 +++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
index 0511833da1..f19c0a1c8e 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
@@ -152,13 +152,13 @@ grantStatement = 'GRANT' ( 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE' ) 'ON' tabl
 ;
 
 revokeStatement = 'REVOKE'
- [ 'GRANT OPTION FOR' ]
- (
-   'SELECT'
- | 'INSERT'
- | 'UPDATE'
- | 'DELETE'
- )
+  [ 'GRANT OPTION FOR' ]
+  (
+    'SELECT'
+  | 'INSERT'
+  | 'UPDATE'
+  | 'DELETE'
+  )
   'ON' tableName
   'FROM' ( userName | roleName | 'PUBLIC')
 ;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 875f11ecde..f365f311d5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -1340,11 +1340,13 @@ class ParserImpl implements Parser {
         parseKeywordIf(ctx, "TABLE");
         Table<?> table = parseTableName(ctx);
 
-        RevokeOnStep s1 = null;
-        if (grantOptionFor)
-            s1 = privileges == null ? ctx.dsl.revokeGrantOptionFor(privilege) : ctx.dsl.revokeGrantOptionFor(privileges);
-        else
-            s1 = privileges == null ? ctx.dsl.revoke(privilege) : ctx.dsl.revoke(privileges);
+        RevokeOnStep s1 = grantOptionFor
+            ? privileges == null
+                ? ctx.dsl.revokeGrantOptionFor(privilege)
+                : ctx.dsl.revokeGrantOptionFor(privileges)
+            : privileges == null
+                ? ctx.dsl.revoke(privilege)
+                : ctx.dsl.revoke(privileges);
 
         parseKeyword(ctx, "FROM");
         User user = parseKeywordIf(ctx, "PUBLIC") ? null : parseUser(ctx);