Skip to content

Commit 99e99e1

Browse files
wumpzwumpz
committed
Merge multi-part-names-ext
2 parents fc01612 + e1f06bb commit 99e99e1

32 files changed

Lines changed: 1416 additions & 1133 deletions

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ public interface ExpressionVisitor {
5454

5555
void visit(Function function);
5656

57-
void visit(InverseExpression inverseExpression);
57+
void visit(SignedExpression signedExpression);
5858

5959
void visit(JdbcParameter jdbcParameter);
60-
61-
void visit(JdbcNamedParameter jdbcNamedParameter);
60+
61+
void visit(JdbcNamedParameter jdbcNamedParameter);
6262

6363
void visit(DoubleValue doubleValue);
6464

@@ -137,10 +137,10 @@ public interface ExpressionVisitor {
137137
void visit(AnalyticExpression aexpr);
138138

139139
void visit(ExtractExpression eexpr);
140-
140+
141141
void visit(IntervalExpression iexpr);
142-
142+
143143
void visit(OracleHierarchicalExpression oexpr);
144-
144+
145145
void visit(RegExpMatchOperator rexpr);
146146
}

src/main/java/net/sf/jsqlparser/expression/InverseExpression.java renamed to src/main/java/net/sf/jsqlparser/expression/SignedExpression.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,27 @@
2222
package net.sf.jsqlparser.expression;
2323

2424
/**
25-
* It represents a "-" before an expression
25+
* It represents a "-" or "+" before an expression
2626
*/
27-
public class InverseExpression implements Expression {
27+
public class SignedExpression implements Expression {
2828

29+
private char sign;
2930
private Expression expression;
3031

31-
public InverseExpression() {
32+
public SignedExpression(char sign, Expression expression) {
33+
setSign(sign);
34+
setExpression(expression);
3235
}
3336

34-
public InverseExpression(Expression expression) {
35-
setExpression(expression);
37+
public char getSign() {
38+
return sign;
39+
}
40+
41+
public final void setSign(char sign) {
42+
this.sign = sign;
43+
if (sign != '+' && sign != '-') {
44+
throw new IllegalArgumentException("illegal sign character, only + - allowed");
45+
}
3646
}
3747

3848
public Expression getExpression() {
@@ -47,4 +57,9 @@ public final void setExpression(Expression expression) {
4757
public void accept(ExpressionVisitor expressionVisitor) {
4858
expressionVisitor.visit(this);
4959
}
60+
61+
@Override
62+
public String toString() {
63+
return getSign() + expression.toString();
64+
}
5065
}

‎src/main/java/net/sf/jsqlparser/schema/Column.java‎

Lines changed: 60 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -21,73 +21,67 @@
2121
*/
2222
package net.sf.jsqlparser.schema;
2323

24-
import net.sf.jsqlparser.expression.Expression;
25-
import net.sf.jsqlparser.expression.ExpressionVisitor;
24+
import net.sf.jsqlparser.expression.*;
2625

2726
/**
2827
* A column. It can have the table name it belongs to.
2928
*/
30-
public class Column implements Expression {
31-
32-
private String columnName = "";
33-
private Table table;
34-
35-
public Column() {
36-
}
37-
38-
public Column(Table table, String columnName) {
39-
this.table = table;
40-
this.columnName = columnName;
41-
}
42-
43-
public Column(String columnName) {
44-
this(null, columnName);
45-
}
46-
47-
public String getColumnName() {
48-
return columnName;
49-
}
50-
51-
public Table getTable() {
52-
return table;
53-
}
54-
55-
public void setColumnName(String string) {
56-
columnName = string;
57-
}
58-
59-
public void setTable(Table table) {
60-
this.table = table;
61-
}
62-
63-
/**
64-
* @return the name of the column, prefixed with 'tableName' and '.'
65-
*/
66-
public String getWholeColumnName() {
67-
68-
String columnWholeName;
69-
String tableWholeName = null;
70-
71-
if (table != null) {
72-
tableWholeName = table.getWholeTableName();
73-
}
74-
if (tableWholeName != null && tableWholeName.length() != 0) {
75-
columnWholeName = tableWholeName + "." + columnName;
76-
} else {
77-
columnWholeName = columnName;
78-
}
79-
80-
return columnWholeName;
81-
82-
}
83-
84-
@Override
85-
public void accept(ExpressionVisitor expressionVisitor) {
86-
expressionVisitor.visit(this);
87-
}
88-
89-
@Override
90-
public String toString() {
91-
return getWholeColumnName();
92-
}
93-
}
29+
public final class Column implements Expression, MultiPartName {
30+
31+
private Table table;
32+
private String columnName;
33+
34+
public Column() {
35+
}
36+
37+
public Column(Table table, String columnName) {
38+
setTable(table);
39+
setColumnName(columnName);
40+
}
41+
42+
public Column(String columnName) {
43+
this(null, columnName);
44+
}
45+
46+
public Table getTable() {
47+
return table;
48+
}
49+
50+
public void setTable(Table table) {
51+
this.table = table;
52+
}
53+
54+
public String getColumnName() {
55+
return columnName;
56+
}
57+
58+
public void setColumnName(String string) {
59+
columnName = string;
60+
}
61+
62+
@Override
63+
public String getFullyQualifiedName() {
64+
StringBuilder fqn = new StringBuilder();
65+
66+
if (table != null) {
67+
fqn.append(table.getFullyQualifiedName());
68+
}
69+
if (fqn.length()>0) {
70+
fqn.append('.');
71+
}
72+
if (columnName != null) {
73+
fqn.append(columnName);
74+
}
75+
return fqn.toString();
76+
}
77+
78+
@Override
79+
public void accept(ExpressionVisitor expressionVisitor) {
80+
expressionVisitor.visit(this);
81+
}
82+
83+
@Override
84+
public String toString() {
85+
return getFullyQualifiedName();
86+
}
87+
}

‎src/main/java/net/sf/jsqlparser/schema/Database.java‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2013 JSQLParser
6+
* %%
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as
9+
* published by the Free Software Foundation, either version 2.1 of the
10+
* License, or (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Lesser Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Lesser Public
18+
* License along with this program. If not, see
19+
* <http://www.gnu.org/licenses/lgpl-2.1.html>.
20+
* #L%
21+
*/
22+
package net.sf.jsqlparser.schema;
23+
24+
public final class Database implements MultiPartName {
25+
private Server server;
26+
private String databaseName;
27+
28+
public Database(String databaseName) {
29+
setDatabaseName(databaseName);
30+
}
31+
32+
public Database(Server server, String databaseName) {
33+
setServer(server);
34+
setDatabaseName(databaseName);
35+
}
36+
37+
public Server getServer() {
38+
return server;
39+
}
40+
41+
public void setServer(Server server) {
42+
this.server = server;
43+
}
44+
45+
public String getDatabaseName() {
46+
return databaseName;
47+
}
48+
49+
public void setDatabaseName(String databaseName) {
50+
this.databaseName = databaseName;
51+
}
52+
53+
@Override
54+
public String getFullyQualifiedName() {
55+
String fqn = "";
56+
57+
if (server != null) {
58+
fqn += server.getFullyQualifiedName();
59+
}
60+
if (!fqn.isEmpty()) {
61+
fqn += ".";
62+
}
63+
64+
if (databaseName != null) {
65+
fqn += databaseName;
66+
}
67+
68+
return fqn;
69+
}
70+
71+
@Override
72+
public String toString() {
73+
return getFullyQualifiedName();
74+
}
75+
}

‎src/main/java/net/sf/jsqlparser/schema/MultiPartName.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2013 JSQLParser
6+
* %%
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as
9+
* published by the Free Software Foundation, either version 2.1 of the
10+
* License, or (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Lesser Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Lesser Public
18+
* License along with this program. If not, see
19+
* <http://www.gnu.org/licenses/lgpl-2.1.html>.
20+
* #L%
21+
*/
22+
package net.sf.jsqlparser.schema;
23+
24+
public interface MultiPartName {
25+
String getFullyQualifiedName();
26+
}

‎src/main/java/net/sf/jsqlparser/schema/Server.java‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/*
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2013 JSQLParser
6+
* %%
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as
9+
* published by the Free Software Foundation, either version 2.1 of the
10+
* License, or (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Lesser Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Lesser Public
18+
* License along with this program. If not, see
19+
* <http://www.gnu.org/licenses/lgpl-2.1.html>.
20+
* #L%
21+
*/
22+
package net.sf.jsqlparser.schema;
23+
24+
import java.util.regex.*;
25+
26+
public final class Server implements MultiPartName {
27+
public static final Pattern SERVER_PATTERN = Pattern.compile("\\[([^\\]]+?)(?:\\\\([^\\]]+))?\\]");
28+
29+
private String serverName;
30+
private String instanceName;
31+
32+
33+
public Server(String serverAndInstanceName) {
34+
if (serverAndInstanceName != null) {
35+
final Matcher matcher = SERVER_PATTERN.matcher(serverAndInstanceName);
36+
if (!matcher.find()) {
37+
throw new IllegalArgumentException(String.format("%s is not a valid database reference", serverAndInstanceName));
38+
}
39+
setServerName(matcher.group(1));
40+
setInstanceName(matcher.group(2));
41+
}
42+
}
43+
44+
public Server(String serverName, String instanceName) {
45+
setServerName(serverName);
46+
setInstanceName(instanceName);
47+
}
48+
49+
public String getServerName() {
50+
return serverName;
51+
}
52+
53+
public void setServerName(String serverName) {
54+
this.serverName = serverName;
55+
}
56+
57+
public String getInstanceName() {
58+
return instanceName;
59+
}
60+
61+
public void setInstanceName(String instanceName) {
62+
this.instanceName = instanceName;
63+
}
64+
65+
@Override
66+
public String getFullyQualifiedName() {
67+
if (serverName != null && !serverName.isEmpty() && instanceName != null && !instanceName.isEmpty()) {
68+
return String.format("[%s\\%s]", serverName, instanceName);
69+
} else if (serverName != null && !serverName.isEmpty()) {
70+
return String.format("[%s]", serverName);
71+
} else {
72+
return "";
73+
}
74+
}
75+
76+
@Override
77+
public String toString() {
78+
return getFullyQualifiedName();
79+
}
80+
}

0 commit comments

Comments
 (0)