diff options
8 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu index 34e85f4c40cf..210a9b7e9bb6 100644 --- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu @@ -50,7 +50,7 @@ </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> - <value>true</value> + <value>false</value> </prop> </node> <node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace"> diff --git a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu index f462444854d2..dc8b3177d439 100644 --- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -75,7 +75,7 @@ </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> - <value>true</value> + <value>false</value> </prop> </node> <node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace"> diff --git a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu index e660674787ce..8711eda250af 100644 --- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -80,7 +80,7 @@ </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> - <value>true</value> + <value>false</value> </prop> </node> <node oor:name="UseBracketedOuterJoinSyntax" oor:op="replace"> diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index bb1b23dfcd27..24cdbdbd6826 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -291,7 +291,7 @@ namespace dbtools bool DatabaseMetaData::generateASBeforeCorrelationName() const { - bool doGenerate( true ); + bool doGenerate( false ); Any setting; if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", *m_pImpl, setting ) ) OSL_VERIFY( setting >>= doGenerate ); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 48335489aa0d..d4b1fe3d1518 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -192,7 +192,7 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString("GenerateASBeforeCorrelationName") ,OUString("Generate AS before table correlation names.") ,sal_False - ,OUString( "true" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index 1b9582623059..3d064f0caacb 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -178,7 +178,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr OUString("GenerateASBeforeCorrelationName") ,OUString("Generate AS before table correlation names.") ,sal_False - ,OUString( "true" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 1a3fa23f376e..72cc6b276e02 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1053,7 +1053,7 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() // known SDB level settings AsciiPropertyValue( "NoNameLengthLimit", makeAny( false ) ), AsciiPropertyValue( "AppendTableAliasName", makeAny( false ) ), - AsciiPropertyValue( "GenerateASBeforeCorrelationName", makeAny( true ) ), + AsciiPropertyValue( "GenerateASBeforeCorrelationName", makeAny( false ) ), AsciiPropertyValue( "ColumnAliasInOrderBy", makeAny( true ) ), AsciiPropertyValue( "EnableSQL92Check", makeAny( false ) ), AsciiPropertyValue( "BooleanComparisonMode", makeAny( BooleanComparisonMode::EQUAL_INTEGER ) ), diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 86ba838e4fd3..936c0db33c4b 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -556,13 +556,13 @@ public class SDBCReportDataFactory implements DataSourceFactory final Boolean escape = (Boolean) prop.getPropertyValue(ESCAPEPROCESSING); rowSetProp.setPropertyValue(ESCAPEPROCESSING, escape); final String queryCommand = (String) prop.getPropertyValue(UNO_COMMAND); - statement = "SELECT * FROM (" + queryCommand + ") AS \"__LibreOffice_report_result\""; + statement = "SELECT * FROM (" + queryCommand + ") \"__LibreOffice_report_result\""; } } else { - statement = "SELECT * FROM (" + command + ") AS \"__LibreOffice_report_result\""; + statement = "SELECT * FROM (" + command + ") \"__LibreOffice_report_result\""; } } rowSetProp.setPropertyValue(UNO_COMMAND, statement); |