Corrected Sql Server multi-part table and column names (database.schema.table.column) in the select statement to accept 4 levels with empty inner parts;

Author: Pap Lőrinc

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

@@ -5,16 +5,16 @@
  * Copyright (C) 2004 - 2013 JSQLParser
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%

src/main/java/net/sf/jsqlparser/expression/SignedExpression.java

@@ -5,16 +5,16 @@
  * Copyright (C) 2004 - 2013 JSQLParser
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%

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

@@ -5,89 +5,92 @@
  * Copyright (C) 2004 - 2013 JSQLParser
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package net.sf.jsqlparser.schema;
 
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.ExpressionVisitor;
+import net.sf.jsqlparser.expression.*;
+import net.sf.jsqlparser.statement.select.*;
 
 /**
  * A column. It can have the table name it belongs to.
  */
-public class Column implements Expression {
-
-	private String columnName = "";
-	private Table table;
-
-	public Column() {
-	}
-
-	public Column(Table table, String columnName) {
-		this.table = table;
-		this.columnName = columnName;
-	}
-
-	public Column(String columnName) {
-		this(null, columnName);
-	}
-
-	public String getColumnName() {
-		return columnName;
-	}
-
-	public Table getTable() {
-		return table;
-	}
-
-	public void setColumnName(String string) {
-		columnName = string;
-	}
-
-	public void setTable(Table table) {
-		this.table = table;
-	}
-
-	/**
-	 * @return the name of the column, prefixed with 'tableName' and '.'
-	 */
-	public String getFullyQualifiedName() {
-
-		String columnWholeName;
-		String tableWholeName = null;
-
-		if (table != null) {
-			tableWholeName = table.getFullyQualifiedName();
-		}
-		if (tableWholeName != null && tableWholeName.length() != 0) {
-			columnWholeName = tableWholeName + "." + columnName;
-		} else {
-			columnWholeName = columnName;
-		}
-
-		return columnWholeName;
-
-	}
-
-	@Override
-	public void accept(ExpressionVisitor expressionVisitor) {
-		expressionVisitor.visit(this);
-	}
-
-	@Override
-	public String toString() {
-		return getFullyQualifiedName();
-	}
-}
+public class Column implements SelectItem, Expression, MultiPartName {
+
+    private Table table;
+    private String columnName;
+
+    public Column() {
+    }
+
+    public Column(Table table, String columnName) {
+        setTable(table);
+        setColumnName(columnName);
+    }
+
+    public Column(String columnName) {
+        this(null, columnName);
+    }
+
+    public Table getTable() {
+        return table;
+    }
+
+    public void setTable(Table table) {
+        this.table = table;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnName(String string) {
+        columnName = string;
+    }
+
+    @Override
+    public String getFullyQualifiedName() {
+        String fqn = "";
+
+        if (table != null) {
+            fqn += table.getFullyQualifiedName();
+        }
+        if (!fqn.isEmpty()) {
+            fqn += ".";
+        }
+
+
+        if (columnName != null) {
+            fqn += columnName;
+        }
+
+        return fqn;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return getFullyQualifiedName();
+    }
+
+    @Override
+    public void accept(SelectItemVisitor selectItemVisitor) {
+        selectItemVisitor.visit(this);
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.schema;
+
+public class Database implements MultiPartName {
+    private Server server;
+    private String databaseName;
+
+    public Database(String databaseName) {
+        setDatabaseName(databaseName);
+    }
+
+    public Database(Server server, String databaseName) {
+        setServer(server);
+        setDatabaseName(databaseName);
+    }
+
+    public Server getServer() {
+        return server;
+    }
+
+    public void setServer(Server server) {
+        this.server = server;
+    }
+
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    public void setDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+    }
+
+    @Override
+    public String getFullyQualifiedName() {
+        String fqn = "";
+
+        if (server != null) {
+            fqn += server.getFullyQualifiedName();
+        }
+        if (!fqn.isEmpty()) {
+            fqn += ".";
+        }
+
+        if (databaseName != null) {
+            fqn += databaseName;
+        }
+
+        return fqn;
+    }
+
+    @Override
+    public String toString() {
+        return getFullyQualifiedName();
+    }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.schema;
+
+public interface MultiPartName {
+    String getFullyQualifiedName();
+}

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

@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.schema;
+
+import java.util.regex.*;
+
+public class Server implements MultiPartName {
+    public static final Pattern SERVER_PATTERN = Pattern.compile("\\[([^\\]]+?)(?:\\\\([^\\]]+))?\\]");
+
+    private String serverName;
+    private String instanceName;
+
+
+    public Server(String serverAndInstanceName) {
+        if (serverAndInstanceName != null) {
+            final Matcher matcher = SERVER_PATTERN.matcher(serverAndInstanceName);
+            if (!matcher.find()) {
+                throw new IllegalArgumentException(String.format("%s is not a valid database reference", serverAndInstanceName));
+            }
+            setServerName(matcher.group(1));
+            setInstanceName(matcher.group(2));
+        }
+    }
+
+    public Server(String serverName, String instanceName) {
+        setServerName(serverName);
+        setInstanceName(instanceName);
+    }
+
+    public String getServerName() {
+        return serverName;
+    }
+
+    public void setServerName(String serverName) {
+        this.serverName = serverName;
+    }
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    @Override
+    public String getFullyQualifiedName() {
+        if (serverName != null && !serverName.isEmpty() && instanceName != null && !instanceName.isEmpty()) {
+            return String.format("[%s\\%s]", serverName, instanceName);
+        } else if (serverName != null && !serverName.isEmpty()) {
+            return String.format("[%s]", serverName);
+        } else {
+            return "";
+        }
+    }
+
+    @Override
+    public String toString() {
+        return getFullyQualifiedName();
+    }
+}