From 87b44efa2a21279d22a3350b3a3d497284621d52 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Mon, 11 Mar 2019 07:20:57 +0300
Subject: tdf#121092: save AppendTableAliasName to ODB

This property corresponds to AppendTableAliasInSelect in Features
sections.
Also the default value in Drivers.xcu for ODBC made consistent
with that in ODatabaseModelImpl::getDefaultDataSourceSettings.

Change-Id: I95335e0808b9b8021189c2c75826c2d792a10566
Reviewed-on: https://gerrit.libreoffice.org/69028
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 connectivity/registry/README                                      | 3 ++-
 .../registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu     | 8 ++++++--
 .../registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu    | 4 +++-
 .../registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu    | 6 ++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'connectivity')

diff --git a/connectivity/registry/README b/connectivity/registry/README
index 833006be3e3e..18842b7b0a26 100644
--- a/connectivity/registry/README
+++ b/connectivity/registry/README
@@ -12,10 +12,11 @@ There are two kinds of properties named "Value":
 
 Each node in Feature section must have an equivalent in Property section
 Most of the time the node name of both sections should be equal,
-however there are 4 known exceptions (more?):
+however there are 5 known exceptions (more?):
 - "UseBracketedOuterJoinSyntax" feature => "EnableOuterJoinEscape" property
 - "UseDOSLineEnds" feature => "PreferDosLikeLineEnds" property
 - "UseSQL92NamingConstraints" feature => "EnableSQL92Check" property
+- "AppendTableAliasInSelect" feature => "AppendTableAliasName" property
 - "UseKeywordAsBeforeAlias" feature => "GenerateASBeforeCorrelationName"
 
 See dbaccess/source/ui/dlg/DbAdminImpl.cxx, ODbDataSourceAdministrationHelper constructor, eg:
diff --git a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 0627fb64066b..22880e912407 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -41,7 +41,8 @@
             <value>true</value>
           </prop>
         </node>
-        <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <node oor:name="AppendTableAliasName" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasInSelect in Features - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
@@ -120,6 +121,7 @@
           </prop>
         </node>
         <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasName in Properties - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
@@ -247,7 +249,8 @@
             <value>true</value>
           </prop>
         </node>
-        <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <node oor:name="AppendTableAliasName" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasInSelect in Features - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
@@ -280,6 +283,7 @@
           </prop>
         </node>
         <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasName in Properties - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
diff --git a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index c92c02b20ec8..03b4ee371cd1 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -66,7 +66,8 @@
             <value>true</value>
           </prop>
         </node>
-        <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <node oor:name="AppendTableAliasName" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasInSelect in Features - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
@@ -155,6 +156,7 @@
           </prop>
         </node>
         <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasName in Properties - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
diff --git a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index e66ecd787b4f..f0d1e03a7bec 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -72,9 +72,10 @@
             <value>false</value>
           </prop>
         </node>
-        <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <node oor:name="AppendTableAliasName" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasInSelect in Features - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
+            <value>false</value>
           </prop>
         </node>
         <node oor:name="GenerateASBeforeCorrelationName" oor:op="replace">
@@ -163,6 +164,7 @@
           </prop>
         </node>
         <node oor:name="AppendTableAliasInSelect" oor:op="replace">
+        <!-- Corresponds to AppendTableAliasName in Properties - see connectivity/registry/README -->
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
           </prop>
-- 
cgit