mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#84073: change ODBC/JDBC escapes to lowercase

Browse Source 
Change-Id: I19ce3acb9575fbef8273bbd84cb4dc322e101ac8
This commit is contained in:
Julien Nabet
2014-10-05 21:14:46 +02:00
committed by Lionel Elie Mamane
parent b5167e1866
commit ee12e843c6
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
connectivity/source/commontools/DateConversion.cxx
View File

@@ -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("'}");

8
connectivity/source/parse/sqlbison.y
View File

@@ -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;
}

2
dbaccess/source/ui/querydesign/QueryDesignView.cxx
View File

@@ -1074,7 +1074,7 @@ namespace
{
// create outer join
if ( bUseEscape )
aStr += "{ OJ ";
aStr += "{ oj ";
aStr += aJoin;
if ( bUseEscape )
aStr += " }";

2
dbaccess/uiconfig/ui/specialsettingspage.ui
View File

@@ -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>