Skip to content

Commit

Permalink
feat: CREATE VIEW ... REFRESH AUTO...
Browse files Browse the repository at this point in the history 
- Merge PR JSQLParser#1691, fixes JSQLParser#1684
    all credits go to @zaza
  • Loading branch information
@manticore-projects
manticore-projects committed Jan 30, 2023
2 parents 2aec1f6 + ea4477b commit 1c8d8da
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 43 deletions.
9 changes: 6 additions & 3 deletions src/main/java/net/sf/jsqlparser/expression/StringValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,25 @@ public final class StringValue extends ASTNodeAccessImpl implements Expression {
private String value = "";
private String prefix = null;

public static final List<String> ALLOWED_PREFIXES = Arrays.asList("N", "U", "E", "R", "B", "RB", "_utf8", "Q");
public static final List<String> ALLOWED_PREFIXES =
Arrays.asList("N", "U", "E", "R", "B", "RB", "_utf8", "Q");

public StringValue() {
// empty constructor
}

public StringValue(String escapedValue) {
// removing "'" at the start and at the end
if (escapedValue.length() >= 2 && escapedValue.startsWith("'") && escapedValue.endsWith("'")) {
if (escapedValue.length() >= 2 && escapedValue.startsWith("'")
&& escapedValue.endsWith("'")) {
value = escapedValue.substring(1, escapedValue.length() - 1);
return;
}

if (escapedValue.length() > 2) {
for (String p : ALLOWED_PREFIXES) {
if (escapedValue.length() > p.length() && escapedValue.substring(0, p.length()).equalsIgnoreCase(p)
if (escapedValue.length() > p.length()
&& escapedValue.substring(0, p.length()).equalsIgnoreCase(p)
&& escapedValue.charAt(p.length()) == '\'') {
this.prefix = p;
value = escapedValue.substring(p.length() + 1, escapedValue.length() - 1);
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/net/sf/jsqlparser/statement/create/view/AutoRefreshOption.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.statement.create.view;

public enum AutoRefreshOption {
NONE,

YES,

NO
}
36 changes: 26 additions & 10 deletions src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public class CreateView implements Statement {
private boolean materialized = false;
private ForceOption force = ForceOption.NONE;
private TemporaryOption temp = TemporaryOption.NONE;
private AutoRefreshOption autoRefresh = AutoRefreshOption.NONE;
private boolean withReadOnly = false;
private boolean ifNotExists = false;

Expand Down Expand Up @@ -96,6 +97,14 @@ public void setTemporary(TemporaryOption temp) {
this.temp = temp;
}

public AutoRefreshOption getAutoRefresh() {
return autoRefresh;
}

public void setAutoRefresh(AutoRefreshOption autoRefresh) {
this.autoRefresh = autoRefresh;
}

public boolean isWithReadOnly() {
return withReadOnly;
}
Expand All @@ -118,16 +127,7 @@ public String toString() {
if (isOrReplace()) {
sql.append("OR REPLACE ");
}
switch (force) {
case FORCE:
sql.append("FORCE ");
break;
case NO_FORCE:
sql.append("NO FORCE ");
break;
default:
// nothing
}
appendForceOptionIfApplicable(sql);

if (temp != TemporaryOption.NONE) {
sql.append(temp.name()).append(" ");
Expand All @@ -141,6 +141,9 @@ public String toString() {
if (ifNotExists) {
sql.append(" IF NOT EXISTS");
}
if (autoRefresh != AutoRefreshOption.NONE) {
sql.append(" AUTO REFRESH ").append(autoRefresh.name());
}
if (columnNames != null) {
sql.append(PlainSelect.getStringList(columnNames, true, true));
}
Expand All @@ -151,6 +154,19 @@ public String toString() {
return sql.toString();
}

private void appendForceOptionIfApplicable(StringBuilder sql) {
switch (force) {
case FORCE:
sql.append("FORCE ");
break;
case NO_FORCE:
sql.append("NO FORCE ");
break;
default:
// nothing
}
}

public CreateView withView(Table view) {
this.setView(view);
return this;
Expand Down
24 changes: 14 additions & 10 deletions src/main/java/net/sf/jsqlparser/util/deparser/CreateViewDeParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import net.sf.jsqlparser.statement.create.view.CreateView;
import net.sf.jsqlparser.statement.create.view.TemporaryOption;
import net.sf.jsqlparser.statement.create.view.AutoRefreshOption;
import net.sf.jsqlparser.statement.select.PlainSelect;
import net.sf.jsqlparser.statement.select.Select;
import net.sf.jsqlparser.statement.select.SelectVisitor;
Expand Down Expand Up @@ -42,16 +43,16 @@ public void deParse(CreateView createView) {
buffer.append("OR REPLACE ");
}
switch (createView.getForce()) {
case FORCE:
buffer.append("FORCE ");
break;
case NO_FORCE:
buffer.append("NO FORCE ");
break;
case NONE:
break;
default:
// nothing
case FORCE:
buffer.append("FORCE ");
break;
case NO_FORCE:
buffer.append("NO FORCE ");
break;
case NONE:
break;
default:
// nothing
}
if (createView.getTemporary() != TemporaryOption.NONE) {
buffer.append(createView.getTemporary().name()).append(" ");
Expand All @@ -63,6 +64,9 @@ public void deParse(CreateView createView) {
if (createView.isIfNotExists()) {
buffer.append(" IF NOT EXISTS");
}
if (createView.getAutoRefresh() != AutoRefreshOption.NONE) {
buffer.append(" AUTO REFRESH ").append(createView.getAutoRefresh().name());
}
if (createView.getColumnNames() != null) {
buffer.append(PlainSelect.getStringList(createView.getColumnNames(), true, true));
}
Expand Down
9 changes: 7 additions & 2 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
| <K_AT: "AT">
| <K_ASC:"ASC">
| <K_AUTHORIZATION:"AUTHORIZATION">
| <K_AUTO:"AUTO">
| <K_BEGIN:"BEGIN">
| <K_BETWEEN:"BETWEEN">
| <K_BINARY: "BINARY">
Expand Down Expand Up @@ -346,6 +347,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
| <K_RECYCLEBIN: "RECYCLEBIN">
| <K_RECURSIVE:"RECURSIVE">
| <K_REFERENCES:"REFERENCES">
| <K_REFRESH:"REFRESH">
| <K_REGEXP: "REGEXP">
| <K_RLIKE: "RLIKE">
| <K_REGISTER: "REGISTER">
Expand Down Expand Up @@ -444,6 +446,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
| <K_XMLAGG:"XMLAGG">
| <K_XMLTEXT:"XMLTEXT">
| <K_YAML:"YAML">
| <K_YES:"YES">
| <K_ZONE:"ZONE">
}

Expand Down Expand Up @@ -1846,7 +1849,7 @@ String RelObjectNameWithoutValue() :
{ Token tk = null; }
{
( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR>
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONFLICT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONFLICT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="YES" | tk="ZONE" )
{ return tk.image; }
}

Expand Down Expand Up @@ -5492,6 +5495,7 @@ CreateView CreateView():
Table view = null;
Select select = null;
List<String> columnNames = null;
Token tk = null;
}
{
<K_CREATE>
Expand All @@ -5506,7 +5510,8 @@ CreateView CreateView():
]
[ <K_MATERIALIZED> { createView.setMaterialized(true);} ]
<K_VIEW> view=Table() { createView.setView(view); }
[ LOOKAHEAD(3) <K_IF> <K_NOT> <K_EXISTS> {createView.setIfNotExists(true);} ]
[LOOKAHEAD(3) <K_AUTO> <K_REFRESH> (tk=<K_YES> | tk=<K_NO>) { createView.setAutoRefresh(AutoRefreshOption.valueOf(tk.image)); } ]
[LOOKAHEAD(3) <K_IF> <K_NOT> <K_EXISTS> {createView.setIfNotExists(true);}]
[ columnNames = ColumnsNamesList() { createView.setColumnNames(columnNames); } ]
<K_AS>
select=SelectWithWithItems( ) { createView.setSelect(select); }
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/net/sf/jsqlparser/expression/StringValueTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void checkStringValue(String original, String expectedValue, String expe
assertEquals(expectedValue, v.getValue());
assertEquals(expectedPrefix, v.getPrefix());
}

@Test
public void testIssue1566EmptyStringValue() {
StringValue v = new StringValue("'");
Expand All @@ -69,22 +69,22 @@ public void testIssue1566EmptyStringValue() {

@Test
public void testOracleAlternativeQuoting() throws JSQLParserException {
String sqlStr="COMMENT ON COLUMN EMP.NAME IS q'{Na'm\\e}'";
String sqlStr = "COMMENT ON COLUMN EMP.NAME IS q'{Na'm\\e}'";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);

sqlStr="COMMENT ON COLUMN EMP.NAME IS q'(Na'm\\e)'";
sqlStr = "COMMENT ON COLUMN EMP.NAME IS q'(Na'm\\e)'";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);

sqlStr="COMMENT ON COLUMN EMP.NAME IS q'[Na'm\\e]'";
sqlStr = "COMMENT ON COLUMN EMP.NAME IS q'[Na'm\\e]'";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);

sqlStr="COMMENT ON COLUMN EMP.NAME IS q''Na'm\\e]''";
sqlStr = "COMMENT ON COLUMN EMP.NAME IS q''Na'm\\e]''";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);

sqlStr="select q'{Its good!}' from dual";
sqlStr = "select q'{Its good!}' from dual";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);

sqlStr="select q'{It's good!}' from dual";
sqlStr = "select q'{It's good!}' from dual";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}
}
Loading

0 comments on commit 1c8d8da

Please sign in to comment.