Skip to content

Commit 7437a75

Browse files
author
Stefan Steinhauser
committed
feat: Simplify grammar
1 parent 0130d56 commit 7437a75

File tree

9 files changed

+439
-413
lines changed

9 files changed

+439
-413
lines changed

src/main/java/net/sf/jsqlparser/statement/CSVFileDestination.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class CSVFileDestination implements ErrorDestination {
1515
private ConnectionDefinition connectionDefinition;
1616
private boolean local;
1717
private boolean secure;
18-
private StringValue filePath;
18+
private StringValue file;
1919

2020
public ConnectionDefinition getConnectionDefinition() {
2121
return connectionDefinition;
@@ -41,12 +41,12 @@ public void setSecure(boolean secure) {
4141
this.secure = secure;
4242
}
4343

44-
public StringValue getFilePath() {
45-
return filePath;
44+
public StringValue getFile() {
45+
return file;
4646
}
4747

48-
public void setFilePath(StringValue filePath) {
49-
this.filePath = filePath;
48+
public void setFile(StringValue file) {
49+
this.file = file;
5050
}
5151

5252
@Override
@@ -68,7 +68,7 @@ public String toString() {
6868
}
6969

7070
sql.append(" FILE ");
71-
sql.append(filePath);
71+
sql.append(file);
7272

7373
return sql.toString();
7474
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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;
11+
12+
import net.sf.jsqlparser.expression.StringValue;
13+
14+
public enum DBMSType implements SourceDestinationType {
15+
EXA,
16+
ORA,
17+
JDBC;
18+
19+
private StringValue jdbcDriverDefinition;
20+
21+
public StringValue getJDBCDriverDefinition() {
22+
return jdbcDriverDefinition;
23+
}
24+
25+
public void setJDBCDriverDefinition(StringValue jdbcDriverDefinition) {
26+
this.jdbcDriverDefinition = jdbcDriverDefinition;
27+
}
28+
29+
@Override
30+
public String toString() {
31+
StringBuilder sql = new StringBuilder();
32+
33+
sql.append(super.toString());
34+
if (jdbcDriverDefinition != null) {
35+
sql.append(" DRIVER = ").append(jdbcDriverDefinition);
36+
}
37+
38+
return sql.toString();
39+
}
40+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2025 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
package net.sf.jsqlparser.statement;
11+
12+
public enum FileType implements SourceDestinationType {
13+
CSV,
14+
FBV
15+
}

src/main/java/net/sf/jsqlparser/statement/imprt/ScriptSource.java renamed to src/main/java/net/sf/jsqlparser/statement/ScriptSourceDestination.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
88
* #L%
99
*/
10-
package net.sf.jsqlparser.statement.imprt;
10+
package net.sf.jsqlparser.statement;
1111

1212
import net.sf.jsqlparser.expression.StringValue;
1313
import net.sf.jsqlparser.schema.Table;
14-
import net.sf.jsqlparser.statement.ConnectionDefinition;
14+
import net.sf.jsqlparser.statement.imprt.ImportFromItem;
1515

1616
import java.io.Serializable;
1717
import java.util.List;
1818

19-
public class ScriptSource extends ImportFromItem implements Serializable {
19+
public class ScriptSourceDestination extends ImportFromItem implements Serializable {
2020
private Table script;
2121
private ConnectionDefinition connectionDefinition;
2222
private List<String> properties;

src/main/java/net/sf/jsqlparser/statement/imprt/DataSource.java renamed to src/main/java/net/sf/jsqlparser/statement/SourceDestinationType.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
88
* #L%
99
*/
10-
package net.sf.jsqlparser.statement.imprt;
10+
package net.sf.jsqlparser.statement;
1111

12-
public enum DataSource {
13-
EXA,
14-
ORA,
15-
JDBC,
16-
CSV,
17-
FBV,
18-
SCRIPT
12+
public interface SourceDestinationType {
1913
}

src/main/java/net/sf/jsqlparser/statement/imprt/DBMSSource.java

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,25 @@
1414
import net.sf.jsqlparser.schema.Column;
1515
import net.sf.jsqlparser.schema.Table;
1616
import net.sf.jsqlparser.statement.ConnectionDefinition;
17+
import net.sf.jsqlparser.statement.SourceDestinationType;
1718
import net.sf.jsqlparser.statement.select.PlainSelect;
1819

1920
import java.io.Serializable;
2021
import java.util.List;
2122

2223
public class DBMSSource extends ImportFromItem implements Serializable {
23-
private DataSource dataSource;
24-
private StringValue jdbcDriverDefinition;
24+
private SourceDestinationType sourceType;
2525
private ConnectionDefinition connectionDefinition;
2626
private Table table;
2727
private ExpressionList<Column> columns;
2828
private List<StringValue> statements;
2929

30-
public DataSource getDataSource() {
31-
return dataSource;
30+
public SourceDestinationType getSourceType() {
31+
return sourceType;
3232
}
3333

34-
public void setDataSource(DataSource dataSource) {
35-
this.dataSource = dataSource;
36-
}
37-
38-
public StringValue getJdbcDriverDefinition() {
39-
return jdbcDriverDefinition;
40-
}
41-
42-
public void setJdbcDriverDefinition(StringValue jdbcDriverDefinition) {
43-
this.jdbcDriverDefinition = jdbcDriverDefinition;
34+
public void setSourceType(SourceDestinationType sourceType) {
35+
this.sourceType = sourceType;
4436
}
4537

4638
public ConnectionDefinition getConnectionDefinition() {
@@ -79,11 +71,7 @@ public void setStatements(List<StringValue> statements) {
7971
public String toString() {
8072
StringBuilder sql = new StringBuilder();
8173

82-
sql.append(dataSource);
83-
84-
if (jdbcDriverDefinition != null) {
85-
sql.append(" DRIVER = ").append(jdbcDriverDefinition);
86-
}
74+
sql.append(sourceType);
8775

8876
sql.append(" ");
8977
sql.append(connectionDefinition);

src/main/java/net/sf/jsqlparser/statement/imprt/FileSource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Objects;
1818

1919
public class FileSource extends ImportFromItem implements Serializable {
20-
private DataSource dataSource;
20+
private SourceDestinationType sourceType;
2121
private List<ConnectionFileDefinition> connectionFileDefinitions;
2222
private Boolean local;
2323
private Boolean secure;
@@ -26,12 +26,12 @@ public class FileSource extends ImportFromItem implements Serializable {
2626
private List<FileOption> fileOptions;
2727
private CertificateVerification certificateVerification;
2828

29-
public DataSource getDataSource() {
30-
return dataSource;
29+
public SourceDestinationType getSourceType() {
30+
return sourceType;
3131
}
3232

33-
public void setDataSource(DataSource dataSource) {
34-
this.dataSource = dataSource;
33+
public void setSourceType(SourceDestinationType sourceType) {
34+
this.sourceType = sourceType;
3535
}
3636

3737
public List<ConnectionFileDefinition> getConnectionFileDefinitions() {
@@ -104,7 +104,7 @@ public String toString() {
104104
}
105105
}
106106

107-
sql.append(dataSource);
107+
sql.append(sourceType);
108108
if (connectionFileDefinitions != null) {
109109
sql.append(" ");
110110
PlainSelect.appendStringListTo(sql, connectionFileDefinitions, false, false);

0 commit comments

Comments
 (0)