cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more support for using SQL_WVARCHAR and SQL_WCHAR data types

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker 2004-12-28 22:28:42 +00:00
parent fcf3321f44
commit 362a97bf56
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/db.cpp
View File

@ -287,14 +287,15 @@ int wxDbColFor::Format(int Nation, int dbDataType, SWORD sqlDataType,
if (i_dbDataType == 0) // Filter unsupported dbDataTypes if (i_dbDataType == 0) // Filter unsupported dbDataTypes
{ {
if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR)) if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR) ||
(i_sqlDataType == SQL_WCHAR) || (i_sqlDataType == SQL_WVARCHAR))
i_dbDataType = DB_DATA_TYPE_VARCHAR; i_dbDataType = DB_DATA_TYPE_VARCHAR;
if ((i_sqlDataType == SQL_C_DATE) || (i_sqlDataType == SQL_C_TIMESTAMP)) if ((i_sqlDataType == SQL_C_DATE) || (i_sqlDataType == SQL_C_TIMESTAMP))
i_dbDataType = DB_DATA_TYPE_DATE; i_dbDataType = DB_DATA_TYPE_DATE;
if (i_sqlDataType == SQL_C_BIT) if (i_sqlDataType == SQL_C_BIT)
i_dbDataType = DB_DATA_TYPE_INTEGER; i_dbDataType = DB_DATA_TYPE_INTEGER;
if (i_sqlDataType == SQL_NUMERIC) if (i_sqlDataType == SQL_NUMERIC)
i_dbDataType = DB_DATA_TYPE_VARCHAR; i_dbDataType = DB_DATA_TYPE_VARCHAR; // glt - ??? is this right?
if (i_sqlDataType == SQL_REAL) if (i_sqlDataType == SQL_REAL)
i_dbDataType = DB_DATA_TYPE_FLOAT; i_dbDataType = DB_DATA_TYPE_FLOAT;
if (i_sqlDataType == SQL_C_BINARY) if (i_sqlDataType == SQL_C_BINARY)
@ -2271,6 +2272,8 @@ bool wxDb::ExecSql(const wxString &pSqlStmt, wxDbColInf** columns, short& numcol
switch (Sdword) switch (Sdword)
{ {
case SQL_WCHAR:
case SQL_WVARCHAR:
case SQL_VARCHAR: case SQL_VARCHAR:
case SQL_CHAR: case SQL_CHAR:
pColInf[colNum].dbDataType = DB_DATA_TYPE_VARCHAR; pColInf[colNum].dbDataType = DB_DATA_TYPE_VARCHAR;
@ -3046,6 +3049,8 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
// Get the intern datatype // Get the intern datatype
switch (colInf[colNo].sqlDataType) switch (colInf[colNo].sqlDataType)
{ {
case SQL_WCHAR:
case SQL_WVARCHAR:
case SQL_VARCHAR: case SQL_VARCHAR:
case SQL_CHAR: case SQL_CHAR:
colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR; colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;