summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-07-22 18:36:05 +0200
committerJulien Nabet <serval2412@yahoo.fr>2014-07-22 18:38:21 +0200
commit568778874429595855b435792e5ebecd52956dae (patch)
treeff4b7207b0b448629c20178f68b3579c0397ef76 /connectivity
parent6296c64fb0ed8bce61eb6303920f952eda65de71 (diff)
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
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu2
-rw-r--r--connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu2
-rw-r--r--connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu2
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/JDriver.cxx2
-rw-r--r--connectivity/source/drivers/odbc/ODriver.cxx2
6 files changed, 6 insertions, 6 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(