Renamed getWholeColumnName and getWholeTableName to getFullyQualifiedName;

Author: Pap Lőrinc

src/main/java/net/sf/jsqlparser/schema/Column.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%
@@ -63,13 +63,13 @@ public void setTable(Table table) {
 	/**
 	 * @return the name of the column, prefixed with 'tableName' and '.'
 	 */
-	public String getWholeColumnName() {
+	public String getFullyQualifiedName() {
 
 		String columnWholeName;
 		String tableWholeName = null;
 
 		if (table != null) {
-			tableWholeName = table.getWholeTableName();
+			tableWholeName = table.getFullyQualifiedName();
 		}
 		if (tableWholeName != null && tableWholeName.length() != 0) {
 			columnWholeName = tableWholeName + "." + columnName;
@@ -88,6 +88,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
 	@Override
 	public String toString() {
-		return getWholeColumnName();
+		return getFullyQualifiedName();
 	}
 }

src/main/java/net/sf/jsqlparser/schema/Table.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%
@@ -75,7 +75,7 @@ public void setAlias(Alias alias) {
 		this.alias = alias;
 	}
 
-	public String getWholeTableName() {
+	public String getFullyQualifiedName() {
 
 		String tableWholeName = null;
 		if (name == null) {
@@ -112,7 +112,7 @@ public void setPivot(Pivot pivot) {
 
 	@Override
 	public String toString() {
-		return getWholeTableName()
+		return getFullyQualifiedName()
 				+ ((pivot != null) ? " " + pivot : "")
 				+ ((alias != null) ? alias.toString() : "");
 	}

src/main/java/net/sf/jsqlparser/statement/alter/Alter.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%
@@ -82,9 +82,9 @@ public void setDataType(ColDataType dataType) {
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
 	}
-	
+
 	@Override
 	public String toString() {
-		return "ALTER TABLE " + table.getWholeTableName() + " ADD COLUMN " + columnName + " " + dataType.toString();
+		return "ALTER TABLE " + table.getFullyQualifiedName() + " ADD COLUMN " + columnName + " " + dataType.toString();
 	}
 }

src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.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%
@@ -79,7 +79,7 @@ public String toString() {
 		buffer.append("INDEX ");
 		buffer.append(index.getName());
 		buffer.append(" ON ");
-		buffer.append(table.getWholeTableName());
+		buffer.append(table.getFullyQualifiedName());
 
 		if (index.getColumnsNames() != null) {
 			buffer.append(" (");

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -174,7 +174,7 @@ public void visit(PlainSelect plainSelect) {
 
 	@Override
 	public void visit(Table tableName) {
-		String tableWholeName = tableName.getWholeTableName();
+		String tableWholeName = tableName.getFullyQualifiedName();
 		if (!otherItemNames.contains(tableWholeName.toLowerCase())
 				&& !tables.contains(tableWholeName)) {
 			tables.add(tableWholeName);

src/main/java/net/sf/jsqlparser/util/deparser/CreateIndexDeParser.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%
@@ -56,7 +56,7 @@ public void deParse(CreateIndex createIndex) {
 		buffer.append("INDEX ");
 		buffer.append(index.getName());
 		buffer.append(" ON ");
-		buffer.append(createIndex.getTable().getWholeTableName());
+		buffer.append(createIndex.getTable().getFullyQualifiedName());
 
 		if (index.getColumnsNames() != null) {
 			buffer.append(" (");

src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.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%
@@ -43,7 +43,7 @@ public CreateTableDeParser(StringBuilder buffer) {
 	}
 
 	public void deParse(CreateTable createTable) {
-		buffer.append("CREATE TABLE ").append(createTable.getTable().getWholeTableName());
+		buffer.append("CREATE TABLE ").append(createTable.getTable().getFullyQualifiedName());
 		if (createTable.getColumnDefinitions() != null) {
 			buffer.append(" (");
 			for (Iterator<ColumnDefinition> iter = createTable.getColumnDefinitions().iterator(); iter.hasNext();) {

src/main/java/net/sf/jsqlparser/util/deparser/CreateViewDeParser.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%
@@ -47,7 +47,7 @@ public void deParse(CreateView createView) {
 		if (createView.isMaterialized()) {
 			buffer.append("MATERIALIZED ");
 		}
-		buffer.append("VIEW ").append(createView.getView().getWholeTableName());
+		buffer.append("VIEW ").append(createView.getView().getFullyQualifiedName());
 		if (createView.getColumnNames() != null) {
 			buffer.append(PlainSelect.getStringList(createView.getColumnNames(), true, true));
 		}

src/main/java/net/sf/jsqlparser/util/deparser/DeleteDeParser.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%
@@ -53,7 +53,7 @@ public void setBuffer(StringBuilder buffer) {
 	}
 
 	public void deParse(Delete delete) {
-		buffer.append("DELETE FROM ").append(delete.getTable().getWholeTableName());
+		buffer.append("DELETE FROM ").append(delete.getTable().getFullyQualifiedName());
 		if (delete.getWhere() != null) {
 			buffer.append(" WHERE ");
 			delete.getWhere().accept(expressionVisitor);

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -289,7 +289,7 @@ public void visit(Column tableColumn) {
 		if (alias != null) {
 			tableName = alias.getName();
 		} else if (tableName == null) {
-			tableName = tableColumn.getTable().getWholeTableName();
+			tableName = tableColumn.getTable().getFullyQualifiedName();
 		}
 		if (tableName != null) {
 			buffer.append(tableName).append(".");