summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-10-05 21:14:46 +0200
committerAndras Timar <andras.timar@collabora.com>2014-10-14 15:28:19 +0200
commit1ef653bdad58f2fde4094f7d648a57b3969a6663 (patch)
tree89aebaff50b8bf6337aa8ff2438fb718d8f75da9 /dbaccess
parentf33c632697d59f772a28b6f91a5827eef31bd9aa (diff)
fdo#84073: change ODBC/JDBC escapes to lowercase
Change-Id: I19ce3acb9575fbef8273bbd84cb4dc322e101ac8 Reviewed-on: https://gerrit.libreoffice.org/11885 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx2
-rw-r--r--dbaccess/uiconfig/ui/specialsettingspage.ui2
3 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index fc9a5a60bef0..8d6eec6c9929 100644
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@ -51,7 +51,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
+ " OR ( \"ID\" = 3 AND \"Postal\" = '6' AND \"Address\" = '7' )"
+ " OR ( \"Address\" = '8' )"
+ " OR ( \"Postal\" = '9' )"
- + " OR ( NOW( ) = {D '2010-01-01' } )";
+ + " OR ( NOW( ) = {d '2010-01-01' } )";
private final static String INNERPRODUCTSQUERY = "products (inner)";
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 1bfb73cddd1a..33bab8fe526e 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1073,7 +1073,7 @@ namespace
{
// create outer join
if ( bUseEscape )
- aStr += "{ OJ ";
+ aStr += "{ oj ";
aStr += aJoin;
if ( bUseEscape )
aStr += " }";
diff --git a/dbaccess/uiconfig/ui/specialsettingspage.ui b/dbaccess/uiconfig/ui/specialsettingspage.ui
index 357461592b18..0072f8ca1128 100644
--- a/dbaccess/uiconfig/ui/specialsettingspage.ui
+++ b/dbaccess/uiconfig/ui/specialsettingspage.ui
@@ -76,7 +76,7 @@
</child>
<child>
<object class="GtkCheckButton" id="useoj">
- <property name="label" translatable="yes">Use Outer Join syntax '{OJ }'</property>
+ <property name="label" translatable="yes">Use Outer Join syntax '{oj }'</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>