Visitar URL original
Fixed: column names in INSERT statement should be simple, not FQN. by wheredevel · Pull Request #589 · JSQLParser/JSqlParser · GitHub
Skip to content

Fixed: column names in INSERT statement should be simple, not FQN. #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wheredevel wants to merge 1 commit into from
Closed

Fixed: column names in INSERT statement should be simple, not FQN. #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions src/main/java/net/sf/jsqlparser/schema/Column.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,41 +62,55 @@ public void setColumnName(String string) {

@Override
public String getFullyQualifiedName() {
return getName(false);
return getFullyQualifiedName(false);
}

/**
* Get name with out without using aliases.
*
* @param aliases
* Get FQN.
* @param aliases - use aliases.
* @return
*/
public String getName(boolean aliases) {
public String getFullyQualifiedName(boolean aliases) {

@AnEmortalKid AnEmortalKid Apr 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this would force us to do a major version bump right?

StringBuilder fqn = new StringBuilder();

if (table != null) {
if (table.getAlias() != null && aliases) {
if (aliases && table.getAlias() != null) {
fqn.append(table.getAlias().getName());
} else {
fqn.append(table.getFullyQualifiedName());
}
}
if (fqn.length() > 0) {
fqn.append('.');
if (fqn.length() > 0) {
fqn.append('.');
}
}
if (columnName != null) {
fqn.append(columnName);
fqn.append(getName());
}

return fqn.toString();
}

/**
* Get name.
* @return
*/
public String getName() {

@AnEmortalKid AnEmortalKid Apr 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe update doc with “@return the simple name of the column. “

StringBuilder name = new StringBuilder();

if (columnName != null) {
name.append(columnName);
}

return name.toString();
}

@Override
public void accept(ExpressionVisitor expressionVisitor) {
expressionVisitor.visit(this);
}

@Override
public String toString() {
return getName(true);
return getFullyQualifiedName();
}
}
8 changes: 7 additions & 1 deletion src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

import java.util.List;

import com.google.common.collect.Lists;

import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.operators.relational.ItemsList;
import net.sf.jsqlparser.schema.Column;
Expand Down Expand Up @@ -218,7 +220,11 @@ public String toString() {
sql.append("INTO ");
sql.append(table).append(" ");
if (columns != null) {
sql.append(PlainSelect.getStringList(columns, true, true)).append(" ");
List<String> simpleNamedColumns = Lists.newArrayListWithCapacity(columns.size());
for (Column column : columns) {
simpleNamedColumns.add(column.getName());
}
sql.append(PlainSelect.getStringList(simpleNamedColumns, true, true)).append(" ");
}

if (useValues) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public void deparseJoin(Join join) {
buffer.append(" USING (");
for (Iterator<Column> iterator = join.getUsingColumns().iterator(); iterator.hasNext();) {
Column column = iterator.next();
buffer.append(column.toString());
buffer.append(column.getFullyQualifiedName());
if (iterator.hasNext()) {
buffer.append(", ");
}
Expand Down