aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/com/healthmarketscience/jackcess/impl/query
diff options
context:
space:
mode:
authorJames Ahlborn <jtahlborn@yahoo.com>2016-01-12 22:41:43 +0000
committerJames Ahlborn <jtahlborn@yahoo.com>2016-01-12 22:41:43 +0000
commit69b84ac737d53c00bf801eccca774535b0a9610c (patch)
tree8af6e5b4d8258e8b53896a1c81f5f77599a39c0c /src/main/java/com/healthmarketscience/jackcess/impl/query
parentfb33e1e13f201d8993833a6e7a843483df5c5d7e (diff)
downloadjackcess-69b84ac737d53c00bf801eccca774535b0a9610c.tar.gz
jackcess-69b84ac737d53c00bf801eccca774535b0a9610c.zip
Fix missing column names in AppendQuery SQL strings. Fixes #131
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@977 f203690c-595d-4dc9-a70b-905162fa7fd2
Diffstat (limited to 'src/main/java/com/healthmarketscience/jackcess/impl/query')
-rw-r--r--src/main/java/com/healthmarketscience/jackcess/impl/query/AppendQueryImpl.java32
1 files changed, 26 insertions, 6 deletions
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/query/AppendQueryImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/query/AppendQueryImpl.java
index 8fb3296..140fde3 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/query/AppendQueryImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/query/AppendQueryImpl.java
@@ -40,6 +40,14 @@ public class AppendQueryImpl extends BaseSelectQueryImpl implements AppendQuery
return getTypeRow().name1;
}
+ public List<String> getTargetColumns() {
+ return new RowFormatter(getTargetRows()) {
+ @Override protected void format(StringBuilder builder, Row row) {
+ toOptionalQuotedExpr(builder, row.name2, true);
+ }
+ }.format();
+ }
+
public String getRemoteDbPath() {
return getTypeRow().name2;
}
@@ -48,6 +56,14 @@ public class AppendQueryImpl extends BaseSelectQueryImpl implements AppendQuery
return getTypeRow().expression;
}
+ public List<String> getValues() {
+ return new RowFormatter(getValueRows()) {
+ @Override protected void format(StringBuilder builder, Row row) {
+ builder.append(row.expression);
+ }
+ }.format();
+ }
+
protected List<Row> getValueRows() {
return filterRowsByFlag(super.getColumnRows(), APPEND_VALUE_FLAG);
}
@@ -57,12 +73,12 @@ public class AppendQueryImpl extends BaseSelectQueryImpl implements AppendQuery
return filterRowsByNotFlag(super.getColumnRows(), APPEND_VALUE_FLAG);
}
- public List<String> getValues() {
- return new RowFormatter(getValueRows()) {
- @Override protected void format(StringBuilder builder, Row row) {
- builder.append(row.expression);
- }
- }.format();
+ protected List<Row> getTargetRows() {
+ return new RowFilter() {
+ @Override protected boolean keep(Row row) {
+ return (row.name2 != null);
+ }
+ }.filter(super.getColumnRows());
}
@Override
@@ -70,6 +86,10 @@ public class AppendQueryImpl extends BaseSelectQueryImpl implements AppendQuery
{
builder.append("INSERT INTO ");
toOptionalQuotedExpr(builder, getTargetTable(), true);
+ List<String> columns = getTargetColumns();
+ if(!columns.isEmpty()) {
+ builder.append(" (").append(columns).append(')');
+ }
toRemoteDb(builder, getRemoteDbPath(), getRemoteDbType());
builder.append(NEWLINE);
List<String> values = getValues();