Kaydet (Commit) f33eb08a authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Mike Kaganski

tdf#121092: synchronize defaults for ODBC settings

The defaults for EnableSQL92Check, PreferDosLikeLineEnds, RespectDriverResultSetType
in connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu made
consistent with respective defaults in ODatabaseModelImpl::getDefaultDataSourceSettings

When inconsistent, the settings don't ever get written to the ODB's
content.xml (likely they are filtered out as default at different levels).
This change allows the non-default to be written. Since the defaults in
ODatabaseModelImpl::getDefaultDataSourceSettings are there at least since
2006 (commit 0eb02629), so that in any
existing ODB the settings are absent if they are equal to those defaults,
they are not changed.

Change-Id: I220336fae666554c1bc23c1915152515fefd18ce
Reviewed-on: https://gerrit.libreoffice.org/68979Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Tested-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 59f58b43
......@@ -68,7 +68,8 @@
</node>
<node oor:name="EnableSQL92Check" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
<!-- must be synchronized with ODatabaseModelImpl::getDefaultDataSourceSettings -->
<value>false</value>
</prop>
</node>
<node oor:name="AppendTableAliasInSelect" oor:op="replace">
......@@ -118,7 +119,8 @@
</node>
<node oor:name="PreferDosLikeLineEnds" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
<!-- must be synchronized with ODatabaseModelImpl::getDefaultDataSourceSettings -->
<value>false</value>
</prop>
</node>
<node oor:name="BooleanComparisonMode" oor:op="replace">
......@@ -143,7 +145,8 @@
</node>
<node oor:name="RespectDriverResultSetType" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
<!-- must be synchronized with ODatabaseModelImpl::getDefaultDataSourceSettings -->
<value>false</value>
</prop>
</node>
</node>
......
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