Skip to content

Commit 1c8d8da

Browse files
manticore-projectsmanticore-projects
committed
feat: CREATE VIEW ... REFRESH AUTO...
- Merge PR #1691, fixes #1684 all credits go to @zaza
2 parents 2aec1f6 + ea4477b commit 1c8d8da

8 files changed

Lines changed: 161 additions & 43 deletions

File tree

‎src/main/java/net/sf/jsqlparser/expression/StringValue.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,25 @@ public final class StringValue extends ASTNodeAccessImpl implements Expression {
2323
private String value = "";
2424
private String prefix = null;
2525

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

2829
public StringValue() {
2930
// empty constructor
3031
}
3132

3233
public StringValue(String escapedValue) {
3334
// removing "'" at the start and at the end
34-
if (escapedValue.length() >= 2 && escapedValue.startsWith("'") && escapedValue.endsWith("'")) {
35+
if (escapedValue.length() >= 2 && escapedValue.startsWith("'")
36+
&& escapedValue.endsWith("'")) {
3537
value = escapedValue.substring(1, escapedValue.length() - 1);
3638
return;
3739
}
3840

3941
if (escapedValue.length() > 2) {
4042
for (String p : ALLOWED_PREFIXES) {
41-
if (escapedValue.length() > p.length() && escapedValue.substring(0, p.length()).equalsIgnoreCase(p)
43+
if (escapedValue.length() > p.length()
44+
&& escapedValue.substring(0, p.length()).equalsIgnoreCase(p)
4245
&& escapedValue.charAt(p.length()) == '\'') {
4346
this.prefix = p;
4447
value = escapedValue.substring(p.length() + 1, escapedValue.length() - 1);

‎src/main/java/net/sf/jsqlparser/statement/create/view/AutoRefreshOption.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2019 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
package net.sf.jsqlparser.statement.create.view;
11+
12+
public enum AutoRefreshOption {
13+
NONE,
14+
15+
YES,
16+
17+
NO
18+
}

‎src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class CreateView implements Statement {
2929
private boolean materialized = false;
3030
private ForceOption force = ForceOption.NONE;
3131
private TemporaryOption temp = TemporaryOption.NONE;
32+
private AutoRefreshOption autoRefresh = AutoRefreshOption.NONE;
3233
private boolean withReadOnly = false;
3334
private boolean ifNotExists = false;
3435

@@ -96,6 +97,14 @@ public void setTemporary(TemporaryOption temp) {
9697
this.temp = temp;
9798
}
9899

100+
public AutoRefreshOption getAutoRefresh() {
101+
return autoRefresh;
102+
}
103+
104+
public void setAutoRefresh(AutoRefreshOption autoRefresh) {
105+
this.autoRefresh = autoRefresh;
106+
}
107+
99108
public boolean isWithReadOnly() {
100109
return withReadOnly;
101110
}
@@ -118,16 +127,7 @@ public String toString() {
118127
if (isOrReplace()) {
119128
sql.append("OR REPLACE ");
120129
}
121-
switch (force) {
122-
case FORCE:
123-
sql.append("FORCE ");
124-
break;
125-
case NO_FORCE:
126-
sql.append("NO FORCE ");
127-
break;
128-
default:
129-
// nothing
130-
}
130+
appendForceOptionIfApplicable(sql);
131131

132132
if (temp != TemporaryOption.NONE) {
133133
sql.append(temp.name()).append(" ");
@@ -141,6 +141,9 @@ public String toString() {
141141
if (ifNotExists) {
142142
sql.append(" IF NOT EXISTS");
143143
}
144+
if (autoRefresh != AutoRefreshOption.NONE) {
145+
sql.append(" AUTO REFRESH ").append(autoRefresh.name());
146+
}
144147
if (columnNames != null) {
145148
sql.append(PlainSelect.getStringList(columnNames, true, true));
146149
}
@@ -151,6 +154,19 @@ public String toString() {
151154
return sql.toString();
152155
}
153156

157+
private void appendForceOptionIfApplicable(StringBuilder sql) {
158+
switch (force) {
159+
case FORCE:
160+
sql.append("FORCE ");
161+
break;
162+
case NO_FORCE:
163+
sql.append("NO FORCE ");
164+
break;
165+
default:
166+
// nothing
167+
}
168+
}
169+
154170
public CreateView withView(Table view) {
155171
this.setView(view);
156172
return this;

‎src/main/java/net/sf/jsqlparser/util/deparser/CreateViewDeParser.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import net.sf.jsqlparser.statement.create.view.CreateView;
1313
import net.sf.jsqlparser.statement.create.view.TemporaryOption;
14+
import net.sf.jsqlparser.statement.create.view.AutoRefreshOption;
1415
import net.sf.jsqlparser.statement.select.PlainSelect;
1516
import net.sf.jsqlparser.statement.select.Select;
1617
import net.sf.jsqlparser.statement.select.SelectVisitor;
@@ -42,16 +43,16 @@ public void deParse(CreateView createView) {
4243
buffer.append("OR REPLACE ");
4344
}
4445
switch (createView.getForce()) {
45-
case FORCE:
46-
buffer.append("FORCE ");
47-
break;
48-
case NO_FORCE:
49-
buffer.append("NO FORCE ");
50-
break;
51-
case NONE:
52-
break;
53-
default:
54-
// nothing
46+
case FORCE:
47+
buffer.append("FORCE ");
48+
break;
49+
case NO_FORCE:
50+
buffer.append("NO FORCE ");
51+
break;
52+
case NONE:
53+
break;
54+
default:
55+
// nothing
5556
}
5657
if (createView.getTemporary() != TemporaryOption.NONE) {
5758
buffer.append(createView.getTemporary().name()).append(" ");
@@ -63,6 +64,9 @@ public void deParse(CreateView createView) {
6364
if (createView.isIfNotExists()) {
6465
buffer.append(" IF NOT EXISTS");
6566
}
67+
if (createView.getAutoRefresh() != AutoRefreshOption.NONE) {
68+
buffer.append(" AUTO REFRESH ").append(createView.getAutoRefresh().name());
69+
}
6670
if (createView.getColumnNames() != null) {
6771
buffer.append(PlainSelect.getStringList(createView.getColumnNames(), true, true));
6872
}

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
149149
| <K_AT: "AT">
150150
| <K_ASC:"ASC">
151151
| <K_AUTHORIZATION:"AUTHORIZATION">
152+
| <K_AUTO:"AUTO">
152153
| <K_BEGIN:"BEGIN">
153154
| <K_BETWEEN:"BETWEEN">
154155
| <K_BINARY: "BINARY">
@@ -346,6 +347,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
346347
| <K_RECYCLEBIN: "RECYCLEBIN">
347348
| <K_RECURSIVE:"RECURSIVE">
348349
| <K_REFERENCES:"REFERENCES">
350+
| <K_REFRESH:"REFRESH">
349351
| <K_REGEXP: "REGEXP">
350352
| <K_RLIKE: "RLIKE">
351353
| <K_REGISTER: "REGISTER">
@@ -444,6 +446,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
444446
| <K_XMLAGG:"XMLAGG">
445447
| <K_XMLTEXT:"XMLTEXT">
446448
| <K_YAML:"YAML">
449+
| <K_YES:"YES">
447450
| <K_ZONE:"ZONE">
448451
}
449452

@@ -1846,7 +1849,7 @@ String RelObjectNameWithoutValue() :
18461849
{ Token tk = null; }
18471850
{
18481851
( 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>
1849-
| 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" )
1852+
| 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" )
18501853
{ return tk.image; }
18511854
}
18521855

@@ -5492,6 +5495,7 @@ CreateView CreateView():
54925495
Table view = null;
54935496
Select select = null;
54945497
List<String> columnNames = null;
5498+
Token tk = null;
54955499
}
54965500
{
54975501
<K_CREATE>
@@ -5506,7 +5510,8 @@ CreateView CreateView():
55065510
]
55075511
[ <K_MATERIALIZED> { createView.setMaterialized(true);} ]
55085512
<K_VIEW> view=Table() { createView.setView(view); }
5509-
[ LOOKAHEAD(3) <K_IF> <K_NOT> <K_EXISTS> {createView.setIfNotExists(true);} ]
5513+
[LOOKAHEAD(3) <K_AUTO> <K_REFRESH> (tk=<K_YES> | tk=<K_NO>) { createView.setAutoRefresh(AutoRefreshOption.valueOf(tk.image)); } ]
5514+
[LOOKAHEAD(3) <K_IF> <K_NOT> <K_EXISTS> {createView.setIfNotExists(true);}]
55105515
[ columnNames = ColumnsNamesList() { createView.setColumnNames(columnNames); } ]
55115516
<K_AS>
55125517
select=SelectWithWithItems( ) { createView.setSelect(select); }

‎src/test/java/net/sf/jsqlparser/expression/StringValueTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void checkStringValue(String original, String expectedValue, String expe
6060
assertEquals(expectedValue, v.getValue());
6161
assertEquals(expectedPrefix, v.getPrefix());
6262
}
63-
63+
6464
@Test
6565
public void testIssue1566EmptyStringValue() {
6666
StringValue v = new StringValue("'");
@@ -69,22 +69,22 @@ public void testIssue1566EmptyStringValue() {
6969

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

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

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

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

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

87-
sqlStr="select q'{It's good!}' from dual";
87+
sqlStr = "select q'{It's good!}' from dual";
8888
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
8989
}
9090
}

0 commit comments

Comments
 (0)