Added:
MYODBCAtt/MYODBCAttTest/MYODBCAttTest.vpj
Modified:
MYODBCRes/MYODBCResLib/MYODBCResServer.cpp
Log:
oops - some missing files
Added: MYODBCAtt/MYODBCAttTest/MYODBCAttTest.vpj
===================================================================
--- MYODBCAtt/MYODBCAttTest/MYODBCAttTest.vpj 2006-02-17 19:04:04 UTC (rev 58)
+++ MYODBCAtt/MYODBCAttTest/MYODBCAttTest.vpj 2006-04-06 22:23:03 UTC (rev 59)
@@ -0,0 +1,72 @@
+<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
+<Project
+ Version="10.0"
+ VendorName="SlickEdit"
+ WorkingDir=".">
+ <Config
+ Name="Release"
+ OutputFile=""
+ CompilerConfigName="Latest Version">
+ <Menu>
+ <Target
+ Name="Compile"
+ MenuCaption="&Compile"
+ CaptureOutputWith="ProcessBuffer"
+ SaveOption="SaveCurrent"
+ RunFromDir="%rw">
+ <Exec/>
+ </Target>
+ <Target
+ Name="Build"
+ MenuCaption="&Build"
+ CaptureOutputWith="ProcessBuffer"
+ SaveOption="SaveWorkspaceFiles"
+ RunFromDir="%rw">
+ <Exec CmdLine="make"/>
+ </Target>
+ <Target
+ Name="Rebuild"
+ MenuCaption="&Rebuild"
+ CaptureOutputWith="ProcessBuffer"
+ SaveOption="SaveWorkspaceFiles"
+ RunFromDir="%rw">
+ <Exec/>
+ </Target>
+ <Target
+ Name="Debug"
+ MenuCaption="&Debug"
+ SaveOption="SaveNone"
+ RunFromDir="%rw">
+ <Exec/>
+ </Target>
+ <Target
+ Name="Execute"
+ MenuCaption="E&xecute"
+ SaveOption="SaveNone"
+ RunFromDir="%rw">
+ <Exec CmdLine='"MYODBCAttTest.exe"'/>
+ </Target>
+ </Menu>
+ </Config>
+ <Files>
+ <Folder
+ Name="Source Files"
+ Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
+ <F N="MYODBCAttTest.cpp"/>
+ </Folder>
+ <Folder
+ Name="Header Files"
+ Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if"/>
+ <Folder
+ Name="Resource Files"
+ Filters="*.ico;*.cur;*.dlg"/>
+ <Folder
+ Name="Bitmaps"
+ Filters="*.bmp"/>
+ <Folder
+ Name="Other Files"
+ Filters="">
+ <F N="MYODBCAttTest.pro"/>
+ </Folder>
+ </Files>
+</Project>
Modified: MYODBCRes/MYODBCResLib/MYODBCResServer.cpp
===================================================================
--- MYODBCRes/MYODBCResLib/MYODBCResServer.cpp 2006-02-17 19:04:04 UTC (rev 58)
+++ MYODBCRes/MYODBCResLib/MYODBCResServer.cpp 2006-04-06 22:23:03 UTC (rev 59)
@@ -312,34 +312,34 @@
break;
case SQL_C_SSHORT:
{
- if ( !variantData.canConvert<short>() )
+ if ( !variantData.canConvert<short int>() )
MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
- *((short *)pdata) = (short)variantData.toInt();
- if ( pnOctetLength ) *pnOctetLength = sizeof(short);
+ *((short int*)pdata) = (short int)variantData.toInt();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(short int);
}
break;
case SQL_C_USHORT:
{
- if ( !variantData.canConvert<unsigned short>() )
+ if ( !variantData.canConvert<unsigned short int>() )
MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
- *((unsigned short *)pdata) = (unsigned short)variantData.toUInt();
- if ( pnOctetLength ) *pnOctetLength = sizeof(unsigned short);
+ *((unsigned short int*)pdata) = (unsigned short int)variantData.toUInt();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(unsigned short int);
}
break;
case SQL_C_SLONG:
{
- if ( !variantData.canConvert<long>() )
+ if ( !variantData.canConvert<long int>() )
MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
- *((long *)pdata) = (long)variantData.toLongLong();
- if ( pnOctetLength ) *pnOctetLength = sizeof(long);
+ *((long int*)pdata) = (long int)variantData.toLongLong();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(long int);
}
break;
case SQL_C_ULONG:
{
- if ( !variantData.canConvert<unsigned long>() )
+ if ( !variantData.canConvert<unsigned long int>() )
MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
- *((unsigned long *)pdata) = (unsigned long)variantData.toULongLong();
- if ( pnOctetLength ) *pnOctetLength = sizeof(unsigned long);
+ *((unsigned long int*)pdata) = (unsigned long
int)variantData.toULongLong();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(unsigned long int);
}
break;
case SQL_C_FLOAT:
@@ -351,16 +351,114 @@
}
break;
case SQL_C_DOUBLE:
+ {
+ if ( !variantData.canConvert<double>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ *((double *)pdata) = (double)variantData.toDouble();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(double);
+ }
+ break;
case SQL_C_BIT:
+ {
+ if ( !variantData.canConvert<unsigned char>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ *((unsigned char *)pdata) = variantData.toInt();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(unsigned char);
+ }
+ break;
case SQL_C_STINYINT:
+ {
+ if ( !variantData.canConvert<char>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ *((char *)pdata) = variantData.toInt();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(char);
+ }
+ break;
case SQL_C_UTINYINT:
+ {
+ if ( !variantData.canConvert<unsigned char>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ *((unsigned char *)pdata) = variantData.toUInt();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(unsigned char);
+ }
+ break;
case SQL_C_SBIGINT:
+ {
+ if ( !variantData.canConvert<qint64>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ *((qint64*)pdata) = (qint64)variantData.toLongLong();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(qint64);
+ }
+ break;
case SQL_C_UBIGINT:
+ {
+ if ( !variantData.canConvert<quint64>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ *((quint64*)pdata) = (quint64)variantData.toULongLong();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(quint64);
+ }
+ break;
case SQL_C_BINARY:
+ {
+ QByteArray bytearray = variantData.toByteArray();
+
+ MYODBCC::doMemCpy( pdata, bytearray.constData(),
pdesrec->getOctetLength() );
+ if ( pnOctetLength ) *pnOctetLength = bytearray.size();
+ }
+ break;
case SQL_C_TYPE_DATE:
+ {
+ SQL_DATE_STRUCT *pdate = (SQL_DATE_STRUCT *)pdata;
+
+ if ( !variantData.canConvert<QDate>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ QDate d = variantData.toDate();
+ pdate->day = d.day();
+ pdate->month = d.month();
+ pdate->year = d.year();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(SQL_DATE_STRUCT);
+ }
+ break;
case SQL_C_TYPE_TIME:
+ {
+ SQL_TIME_STRUCT *ptime = (SQL_TIME_STRUCT *)pdata;
+
+ if ( !variantData.canConvert<QTime>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ QTime t = variantData.toTime();
+ ptime->hour = t.hour();
+ ptime->minute = t.minute();
+ ptime->second = t.second();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(SQL_TIME_STRUCT);
+ }
+ break;
case SQL_C_TYPE_TIMESTAMP:
+ {
+ SQL_TIMESTAMP_STRUCT *p = (SQL_TIMESTAMP_STRUCT *)pdata;
+
+ if ( !variantData.canConvert<QDateTime>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ QDateTime t = variantData.toDateTime();
+ p->day = t.date().day();
+ p->fraction = t.time().msec(); /* \todo fraction is not same as
msec - look into it */
+ p->hour = t.time().hour();
+ p->minute = t.time().minute();
+ p->month = t.date().month();
+ p->second = t.time().second();
+ p->year = t.date().year();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(SQL_TIMESTAMP_STRUCT);
+ }
+ break;
case SQL_C_NUMERIC:
+ {
+ SQL_NUMERIC_STRUCT *p = (SQL_NUMERIC_STRUCT *)pdata;
+
+ if ( !variantData.canConvert<QDateTime>() )
+ MYODBCDbgReturn( getDia()->doAppend( MYODBC_DIA_07006 ) );
+ QDateTime t = variantData.toDateTime();
+ if ( pnOctetLength ) *pnOctetLength = sizeof(SQL_NUMERIC_STRUCT);
+ }
+ break;
case SQL_C_GUID:
case SQL_C_DEFAULT:
case SQL_C_INTERVAL_MONTH:
| Thread |
|---|
| • Connector/ODBC 5 commit: r59 - MYODBCAtt/MYODBCAttTest MYODBCRes/MYODBCResLib | pharvey | 7 Apr |
