github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-31 22:04:04 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Sql/ODBC: Fixed MSSQL issues

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7773 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-10-13 11:40:07 +00:00
parent c11d899cb9
commit 2ec423cd7c
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
uppsrc/ODBC/ODBC.cpp
View file

@ -302,6 +302,10 @@ bool ODBCConnection::IsOk(SQLRETURN ret) const
void ODBCConnection::SetParam(int i, const Value& r)
{
Param& p = param.At(i);
if(IsNull(r)) {
p.li = SQL_NULL_DATA;
return;
}
if(IsNumber(r)) {
if(r.Is<int64>()) {
int64 x = r;
@ -312,10 +316,19 @@ void ODBCConnection::SetParam(int i, const Value& r)
}
else {
double x = r;
p.ctype = SQL_C_DOUBLE;
p.sqltype = SQL_DOUBLE;
p.data = String((char *)&x, sizeof(x));
p.li = sizeof(x);
if(x >= INT_MIN && x < INT_MAX && (int)x == x) {
long int h = (int)x;
p.ctype = SQL_C_SLONG;
p.sqltype = SQL_INTEGER;
p.data = String((char *)&h, sizeof(h));
p.li = sizeof(h);
}
else {
p.ctype = SQL_C_DOUBLE;
p.sqltype = SQL_DOUBLE;
p.data = String((char *)&x, sizeof(x));
p.li = sizeof(x);
}
}
}
if(IsString(r)) {
@ -339,8 +352,6 @@ void ODBCConnection::SetParam(int i, const Value& r)
p.data = String((char *)&tm, sizeof(tm));
p.li = sizeof(tm);
}
if(IsNull(r))
p.li = SQL_NULL_DATA;
}
bool ODBCConnection::Execute()

4
uppsrc/Sql/SqlStatement.cpp
View file

@ -307,7 +307,9 @@ SqlWith& SqlWith::With(SqlId table)
SqlWith& SqlWith::WithRecursive(SqlId table)
{
text << (text.GetCount() ? ", " : "with ") << "recursive " << table.Quoted();
text << (text.GetCount() ? ", " : "with ")
<< SqlCase(MSSQL, "")("recursive ")
<< table.Quoted();
args = false;
return *this;
}