Kaydet (Commit) 56877887 authored tarafından Julien Nabet's avatar Julien Nabet

Resolves fdo#81213: Wrong table-clause generated by reportbuilder

Oracle doesn't accept "AS" for making an alias from a table
See https://bugs.freedesktop.org/show_bug.cgi?id=81213#c2
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c4
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c5
for more information

(thank you Lionel)

Change-Id: I33c86d78b2590116d4af46ffd3e54c3c791268ea
üst 6296c64f
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</node> </node>
<node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean"> <prop oor:name="Value" oor:type="xs:boolean">
<value>true</value> <value>false</value>
</prop> </prop>
</node> </node>
<node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace"> <node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace">
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</node> </node>
<node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean"> <prop oor:name="Value" oor:type="xs:boolean">
<value>true</value> <value>false</value>
</prop> </prop>
</node> </node>
<node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace"> <node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace">
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</node> </node>
<node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean"> <prop oor:name="Value" oor:type="xs:boolean">
<value>true</value> <value>false</value>
</prop> </prop>
</node> </node>
<node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace"> <node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace">
......
...@@ -291,7 +291,7 @@ namespace dbtools ...@@ -291,7 +291,7 @@ namespace dbtools
bool DatabaseMetaData::generateASBeforeCorrelationName() const bool DatabaseMetaData::generateASBeforeCorrelationName() const
{ {
bool doGenerate( true ); bool doGenerate( false );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= doGenerate ); OSL_VERIFY( setting >>= doGenerate );
......
...@@ -192,7 +192,7 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const ...@@ -192,7 +192,7 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const
OUString("GenerateASBeforeCorrelationName") OUString("GenerateASBeforeCorrelationName")
,OUString("Generate AS before table correlation names.") ,OUString("Generate AS before table correlation names.")
,sal_False ,sal_False
,OUString( "true" ) ,OUString( "false" )
,aBooleanValues) ,aBooleanValues)
); );
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
......
...@@ -178,7 +178,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr ...@@ -178,7 +178,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr
OUString("GenerateASBeforeCorrelationName") OUString("GenerateASBeforeCorrelationName")
,OUString("Generate AS before table correlation names.") ,OUString("Generate AS before table correlation names.")
,sal_False ,sal_False
,OUString( "true" ) ,OUString( "false" )
,aBooleanValues) ,aBooleanValues)
); );
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
......
...@@ -1053,7 +1053,7 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() ...@@ -1053,7 +1053,7 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
// known SDB level settings // known SDB level settings
AsciiPropertyValue( "NoNameLengthLimit", makeAny( false ) ), AsciiPropertyValue( "NoNameLengthLimit", makeAny( false ) ),
AsciiPropertyValue( "AppendTableAliasName", makeAny( false ) ), AsciiPropertyValue( "AppendTableAliasName", makeAny( false ) ),
AsciiPropertyValue( "GenerateASBeforeCorrelationName", makeAny( true ) ), AsciiPropertyValue( "GenerateASBeforeCorrelationName", makeAny( false ) ),
AsciiPropertyValue( "ColumnAliasInOrderBy", makeAny( true ) ), AsciiPropertyValue( "ColumnAliasInOrderBy", makeAny( true ) ),
AsciiPropertyValue( "EnableSQL92Check", makeAny( false ) ), AsciiPropertyValue( "EnableSQL92Check", makeAny( false ) ),
AsciiPropertyValue( "BooleanComparisonMode", makeAny( BooleanComparisonMode::EQUAL_INTEGER ) ), AsciiPropertyValue( "BooleanComparisonMode", makeAny( BooleanComparisonMode::EQUAL_INTEGER ) ),
......
...@@ -556,13 +556,13 @@ public class SDBCReportDataFactory implements DataSourceFactory ...@@ -556,13 +556,13 @@ public class SDBCReportDataFactory implements DataSourceFactory
final Boolean escape = (Boolean) prop.getPropertyValue(ESCAPEPROCESSING); final Boolean escape = (Boolean) prop.getPropertyValue(ESCAPEPROCESSING);
rowSetProp.setPropertyValue(ESCAPEPROCESSING, escape); rowSetProp.setPropertyValue(ESCAPEPROCESSING, escape);
final String queryCommand = (String) prop.getPropertyValue(UNO_COMMAND); final String queryCommand = (String) prop.getPropertyValue(UNO_COMMAND);
statement = "SELECT * FROM (" + queryCommand + ") AS \"__LibreOffice_report_result\""; statement = "SELECT * FROM (" + queryCommand + ") \"__LibreOffice_report_result\"";
} }
} }
else else
{ {
statement = "SELECT * FROM (" + command + ") AS \"__LibreOffice_report_result\""; statement = "SELECT * FROM (" + command + ") \"__LibreOffice_report_result\"";
} }
} }
rowSetProp.setPropertyValue(UNO_COMMAND, statement); rowSetProp.setPropertyValue(UNO_COMMAND, statement);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment