From 78bfcc6d524f0fc3c0d23a2d13902954fbd07e5c Mon Sep 17 00:00:00 2001 From: Emily Ong Date: Mon, 12 May 2025 15:11:30 +0800 Subject: [PATCH] feat: support distinctrow keyword --- .../parser/ParserKeywordsUtils.java | 1 + .../jsqlparser/statement/select/Distinct.java | 12 ++++++++++- .../util/deparser/SelectDeParser.java | 2 ++ .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 3 +++ src/site/sphinx/keywords.rst | 2 ++ .../statement/select/SelectTest.java | 21 +++++++++++++++++++ 6 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java index 6e6019a64..19e89ff18 100644 --- a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java +++ b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java @@ -63,6 +63,7 @@ public class ParserKeywordsUtils { {"CURRENT", RESTRICTED_JSQLPARSER}, {"DEFAULT", RESTRICTED_ALIAS}, {"DISTINCT", RESTRICTED_SQL2016}, + {"DISTINCTROW", RESTRICTED_SQL2016}, {"DOUBLE", RESTRICTED_ALIAS}, {"ELSE", RESTRICTED_JSQLPARSER}, {"EXCEPT", RESTRICTED_SQL2016}, diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Distinct.java b/src/main/java/net/sf/jsqlparser/statement/select/Distinct.java index 37f64ad81..c0312384a 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/Distinct.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/Distinct.java @@ -20,6 +20,7 @@ public class Distinct implements Serializable { private List> onSelectItems; private boolean useUnique = false; + private boolean useDistinctRow = false; public Distinct() {} @@ -43,9 +44,18 @@ public void setUseUnique(boolean useUnique) { this.useUnique = useUnique; } + public boolean isUseDistinctRow() { + return useDistinctRow; + } + + public void setUseDistinctRow(boolean useDistinctRow) { + this.useDistinctRow = useDistinctRow; + } + @Override public String toString() { - String sql = useUnique ? "UNIQUE" : "DISTINCT"; + String distinctIdentifier = useDistinctRow ? "DISTINCTROW" : "DISTINCT"; + String sql = useUnique ? "UNIQUE" : distinctIdentifier; if (onSelectItems != null && !onSelectItems.isEmpty()) { sql += " ON (" + PlainSelect.getStringList(onSelectItems) + ")"; diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java index c14c9b9ab..022934a5d 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java @@ -397,6 +397,8 @@ protected void deparseDistinctClause(Distinct distinct) { if (distinct != null) { if (distinct.isUseUnique()) { builder.append("UNIQUE "); + } else if (distinct.isUseDistinctRow()) { + builder.append("DISTINCTROW "); } else { builder.append("DISTINCT "); } diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 89d7227e2..40275b597 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -239,6 +239,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -3027,6 +3028,8 @@ PlainSelect PlainSelect() #PlainSelect: [ LOOKAHEAD(2) "ON" "(" distinctOn=SelectItemsList() { plainSelect.getDistinct().setOnSelectItems(distinctOn); } ")" ] ) | + { Distinct distinct = new Distinct(); distinct.setUseDistinctRow(true); plainSelect.setDistinct(distinct); } + | { Distinct distinct = new Distinct(true); plainSelect.setDistinct(distinct); } | { plainSelect.setMySqlSqlCalcFoundRows(true); } diff --git a/src/site/sphinx/keywords.rst b/src/site/sphinx/keywords.rst index 941d8d175..93842cc27 100644 --- a/src/site/sphinx/keywords.rst +++ b/src/site/sphinx/keywords.rst @@ -43,6 +43,8 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and +----------------------+-------------+-----------+ | DISTINCT | Yes | Yes | +----------------------+-------------+-----------+ +| DISTINCTROW | Yes | Yes | ++----------------------+-------------+-----------+ | DOUBLE | Yes | | +----------------------+-------------+-----------+ | ELSE | Yes | Yes | diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java index cc0cbda66..9147a22d3 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java @@ -1058,6 +1058,27 @@ public void testDistinct() throws JSQLParserException { .getExpression()).getColumnName()); } + @Test + public void testDistinctRow() throws JSQLParserException { + String statement = + "SELECT DISTINCTROW col1, col2 FROM mytable WHERE mytable.col = 9"; + Select select = (Select) TestUtils.assertSqlCanBeParsedAndDeparsed(statement, true); + + assertInstanceOf(PlainSelect.class, select); + + PlainSelect plainSelect = (PlainSelect) select; + Distinct distinct = plainSelect.getDistinct(); + + assertNotNull(distinct); + assertTrue(distinct.isUseDistinctRow()); + assertNull(distinct.getOnSelectItems()); + + assertEquals("col1", ((Column) (plainSelect.getSelectItems().get(0)) + .getExpression()).getColumnName()); + assertEquals("col2", ((Column) (plainSelect.getSelectItems().get(1)) + .getExpression()).getColumnName()); + } + @Test public void testIsDistinctFrom() throws JSQLParserException { String stmt = "SELECT name FROM tbl WHERE name IS DISTINCT FROM foo";