From b9042d2e46f4a0645b63efb23e49b9421d04d837 Mon Sep 17 00:00:00 2001 From: Damjan Jovanovic Date: Sat, 7 Nov 2015 18:26:04 +0000 Subject: #i126029# Base query wizard error due to missing quoting of table and column names During the Base query design wizard, com.sun.star.wizards.ui.FilterComponent.getFilterConditions() calls com.sun.star.wizards.db.SQLQueryComposer.getSelectClause() before its getFromClause(). However the getSelectClause() needs composedCommandNames which is populated only by getFromClause() in order to quote table and column names. Without this, table and column names that need quoting (spaces, special characters, reserved words) produce errors. (cherry picked from commit 046771cac8605e5826a150e4454eff332b65d517) --- wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 4a7a679f3479..7a99b7d1d0f8 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -68,6 +68,10 @@ public class SQLQueryComposer public String getSelectClause(boolean _baddAliasFieldNames) throws SQLException { + // getFromClause() must be called first to populate composedCommandNames, + // but it's idempotent, so let's call it now in case the caller didn't already: + getFromClause(); + String sSelectBaseClause = "SELECT "; String sSelectClause = sSelectBaseClause; for (int i = 0; i < CurDBMetaData.FieldColumns.length; i++) -- cgit