diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-01-23 15:30:33 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-01-23 16:32:53 +0100 |
| commit | 5214bda61e413b5b2907bcffbbf0211c254b878f (patch) | |
| tree | 991d1d09c4e6fa6999ec144b8045462de948bb1b /connectivity | |
| parent | ce59b1b3978cc148090385e086c8d48d742801d0 (diff) | |
SQL parser: no "as" rule anymore; now as_clause and opt_as
Change-Id: Ib0c7151b311029318c213abb86e6541e3b27d040
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/inc/connectivity/sqlnode.hxx | 3 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 19 |
2 files changed, 17 insertions, 5 deletions
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index 4082375051fb..a74c8abe84e7 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -219,7 +219,8 @@ namespace connectivity data_type, column_def, table_node, - as, + as_clause, + opt_as, op_column_commalist, table_primary_as_range_column, datetime_primary, diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index ca2281a0708a..5ab87fa18d71 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -392,9 +392,19 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, bHandled = impl_parseTableNameNodeToString_throw( rString, rParam ); break; - case as: - if ( rParam.aMetaData.generateASBeforeCorrelationName() ) - rString.append(::rtl::OUString(" AS")); + case as_clause: + assert(nCount == 0 || nCount == 2); + if (nCount == 2) + { + if ( rParam.aMetaData.generateASBeforeCorrelationName() ) + rString.append(::rtl::OUString(" AS ")); + m_aChildren[1]->impl_parseNodeToString_throw( rString, rParam ); + } + bHandled = true; + break; + + case opt_as: + assert(nCount == 0); bHandled = true; break; @@ -1386,7 +1396,8 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star: { OSQLParseNode::data_type, "data_type" }, { OSQLParseNode::column_def, "column_def" }, { OSQLParseNode::table_node, "table_node" }, - { OSQLParseNode::as, "as" }, + { OSQLParseNode::as_clause, "as_clause" }, + { OSQLParseNode::opt_as, "opt_as" }, { OSQLParseNode::op_column_commalist, "op_column_commalist" }, { OSQLParseNode::table_primary_as_range_column, "table_primary_as_range_column" }, { OSQLParseNode::datetime_primary, "datetime_primary" }, |