diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-10-05 21:14:46 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-10-09 18:22:15 +0200 |
| commit | ee12e843c609e747be2f7d5a89ffd889c78378de (patch) | |
| tree | 73e8b9761e4df5e2fbb69d36ac391b41a3373fe1 | |
| parent | b5167e1866efb646270edce8b37894a93bea2cde (diff) | |
fdo#84073: change ODBC/JDBC escapes to lowercase
Change-Id: I19ce3acb9575fbef8273bbd84cb4dc322e101ac8
| -rw-r--r-- | connectivity/source/commontools/DateConversion.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/specialsettingspage.ui | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 24e41dd9ab93..f762c645730f 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -136,7 +136,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b if ( bOk ) { if (bQuote) - aRet.appendAscii("{TS '"); + aRet.appendAscii("{ts '"); aRet.append(DBTypeConversion::toDateTimeString(aDateTime)); if (bQuote) aRet.appendAscii("'}"); @@ -166,7 +166,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b bOk = _rVal >>= aDate; OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not date!"); if (bQuote) - aRet.appendAscii("{D '"); + aRet.appendAscii("{d '"); aRet.append(DBTypeConversion::toDateString(aDate)); if (bQuote) aRet.appendAscii("'}"); @@ -193,7 +193,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b bOk = _rVal >>= aTime; OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal is not time!"); if (bQuote) - aRet.appendAscii("{T '"); + aRet.appendAscii("{t '"); aRet.append(DBTypeConversion::toTimeString(aTime)); if (bQuote) aRet.appendAscii("'}"); diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index e63bfe10c696..7a2ad837cfb7 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -4660,6 +4660,14 @@ OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pCont aStr = yytname[YYTRANSLATE(nTokenID)]; if(aStr.startsWith("SQL_TOKEN_")) aStr = aStr.copy(10); + switch( nTokenID ) + { + case SQL_TOKEN_OJ: + case SQL_TOKEN_TS: + case SQL_TOKEN_T: + case SQL_TOKEN_D: + aStr = aStr.toAsciiLowerCase(); + } } return aStr; } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index c095a73ee036..4914156429f6 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1074,7 +1074,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> |