diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index a8699c1075..0cd2da5fe7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -10334,6 +10334,14 @@ final class ParserImpl implements Parser {
 
                 break;
 
+            case 'J':
+                if (parseKeywordOrIdentifierIf(ctx, "JSON"))
+                    return SQLDataType.JSON;
+                else if (parseKeywordOrIdentifierIf(ctx, "JSONB"))
+                    return SQLDataType.JSONB;
+
+                break;
+
             case 'L':
                 if (parseKeywordOrIdentifierIf(ctx, "LONGBLOB"))
                     return SQLDataType.BLOB;
@@ -10460,6 +10468,12 @@ final class ParserImpl implements Parser {
                     return parseDataTypeLength(ctx, SQLDataType.VARBINARY);
 
                 break;
+
+            case 'X':
+                if (parseKeywordOrIdentifierIf(ctx, "XML"))
+                    return SQLDataType.XML;
+
+                break;
         }
 
         return new DefaultDataType(ctx.dsl.dialect(), Object.class, parseIdentifier(ctx).toString());