Removed:
test/include/mytest.h
Modified:
test/include/mytest3.h
test/test32/mytest32.c
test/unixodbc/my_unixodbc.c
test/use_result/use_result.pro
Log:
more tweaks to post-build tests
Deleted: test/include/mytest.h
===================================================================
--- test/include/mytest.h 2006-03-01 00:38:45 UTC (rev 37)
+++ test/include/mytest.h 2006-03-01 06:46:29 UTC (rev 38)
@@ -1,264 +0,0 @@
-/***************************************************************************
- mytest.h - description
- -------------------
- begin : Wed Aug 8 2001
- copyright : (C) 2001 by Venu, MySQL AB
- email : venu@stripped
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-#ifndef __TMYODBC__TEST__H
-#define __TMYODBC__TEST__H
-
-#ifdef HAVE_CONFIG_H
-#include <myconf.h>
-#endif
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#ifndef MY_DEBUG
-#define MY_DEBUG
-#endif
-
-/* STANDARD C HEADERS */
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-/* ODBC HEADERS */
-#include <sql.h>
-#include <sqlext.h>
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef ushort
-#define ushort unsigned short
-#endif
-
-#ifndef bool
-#define bool unsigned char
-#endif
-
-#ifndef true
-#define true 1
-#endif
-
-#ifndef false
-#define false 0
-#endif
-
-#ifndef my_assert
-#define my_assert assert
-#endif
-
-#ifndef myassert
-#define myassert assert
-#endif
-
-#ifndef Sleep
-#define Sleep _sleep
-#endif
-
-#ifdef MY_DEBUG
-#define printMessage printf
-#else
-#define printMessage
-#endif
-
-#define MAX_NAME_LEN 95
-#define MAX_COLUMNS 255
-#define MAX_ROW_DATA_LEN 255
-
-SQLCHAR *mydsn = "test";
-SQLCHAR *myuid = "root";
-SQLCHAR *mypwd = "";
-
-/* PROTOTYPE */
-void myerror(SQLRETURN rc,SQLHENV henv,SQLHDBC hdbc,SQLHSTMT hstmt);
-SQLUINTEGER myresult(SQLHSTMT hstmt);
-
-/* UTILITY MACROS */
-#define myenv(henv,r) if ( ((r) != SQL_SUCCESS) ) myerror(r, henv, NULL, NULL);
my_assert( ((r) == SQL_SUCCESS) || ((r) == SQL_SUCCESS_WITH_INFO) )
-#define myenv_err(henv,r,rc) if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
myerror(rc, henv, NULL, NULL); my_assert( r )
-#define myenv_r(henv,rc) if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
myerror(rc, henv, NULL, NULL); my_assert( rc == SQL_ERROR)
-#define mycon(hdbc,r) if ( ((r) != SQL_SUCCESS) ) myerror(r, NULL, hdbc, NULL);
my_assert( ((r) == SQL_SUCCESS) || ((r) == SQL_SUCCESS_WITH_INFO) )
-#define mycon_err(hdbc,r,rc) if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
myerror(rc, NULL, hdbc, NULL); my_assert( r )
-#define mycon_r(hdbc,rc) if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
myerror(rc, NULL, hdbc, NULL); my_assert( rc == SQL_ERROR)
-#define mystmt(hstmt,r) if ( ((r) != SQL_SUCCESS) ) myerror(r, NULL, NULL, hstmt);
my_assert( ((r) == SQL_SUCCESS) || ((r) == SQL_SUCCESS_WITH_INFO) )
-#define mystmt_err(hstmt,r,rc) if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
myerror(rc, NULL, NULL, hstmt); my_assert( r )
-#define mystmt_r(hstmt,rc) if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
myerror(rc, NULL, NULL, hstmt); my_assert( rc == SQL_ERROR)
-/**
-ERROR HANDLER
-*/
-void myerror(SQLRETURN rc, SQLHENV henv, SQLHDBC hdbc, SQLHSTMT hstmt)
-{
- RETCODE lrc;
-
- if( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
- {
- SQLCHAR szSqlState[6],szErrorMsg[SQL_MAX_MESSAGE_LENGTH];
- SQLINTEGER pfNativeError;
- SQLSMALLINT pcbErrorMsg;
-
- lrc = SQLError(henv,hdbc,hstmt,
- (SQLCHAR *)&szSqlState,
- (SQLINTEGER *)&pfNativeError,
- (SQLCHAR *)&szErrorMsg,
- SQL_MAX_MESSAGE_LENGTH-1,
- (SQLSMALLINT *)&pcbErrorMsg);
-
- if(lrc == SQL_SUCCESS || lrc == SQL_SUCCESS_WITH_INFO)
- printMessage("\n%d,[%s][%d:%s]\n",rc,szSqlState,pfNativeError,szErrorMsg);
- else
- printMessage("SQLError returned :%d, but rc = %d\n",lrc,rc);
- }
-}
-/**
- CONNECTION
-*/
-void myconnect(SQLHENV *henv,SQLHDBC *hdbc, SQLHSTMT *hstmt)
-{
- SQLRETURN rc;
-
- rc = SQLAllocEnv(henv);
- myenv(*henv,rc);
-
- rc = SQLAllocConnect(*henv, hdbc);
- myenv(*henv,rc);
-
- printMessage("connecting to '%s' with user name '%s'...\n",mydsn,myuid);
- rc = SQLConnect(*hdbc, mydsn, SQL_NTS, myuid, SQL_NTS, mypwd, SQL_NTS);
- mycon(*hdbc,rc);
-
- rc = SQLSetConnectOption(*hdbc,SQL_AUTOCOMMIT,SQL_AUTOCOMMIT_ON);
- mycon(*hdbc,rc);
-
- rc = SQLAllocStmt(*hdbc, hstmt);
- mycon(*hdbc,rc);
-
- rc = SQLSetStmtOption(*hstmt,SQL_CURSOR_TYPE,SQL_CURSOR_STATIC);
- mystmt(*hstmt,rc);
-
- /* MS SQL Server to work...*/
-#if 0
- SQLSetStmtAttr(hstmt, SQL_ATTR_CONCURRENCY, (SQLPOINTER) SQL_CONCUR_ROWVER, 0);
- SQLSetStmtAttr(hstmt, SQL_ATTR_CURSOR_TYPE, (SQLPOINTER) SQL_CURSOR_KEYSET_DRIVEN, 0);
-#endif
-}
-/**
- DISCONNECT
-*/
-void mydisconnect(SQLHENV *henv,SQLHDBC *hdbc, SQLHSTMT *hstmt)
-{
- SQLRETURN rc;
-
- rc = SQLFreeStmt(*hstmt, SQL_DROP);
- mystmt(*hstmt,rc);
-
- rc = SQLDisconnect(*hdbc);
- mycon(*hdbc,rc);
-
- rc = SQLFreeConnect(*hdbc);
- mycon(*hdbc,rc);
-
- rc = SQLFreeEnv(*henv);
- myenv(*henv,rc);
-}
-/**
- RESULT SET
-*/
-SQLUINTEGER myresult(SQLHSTMT hstmt)
-{
- SQLRETURN rc;
- SQLUINTEGER nRowCount=0, pcColDef;
- SQLCHAR szColName[MAX_NAME_LEN];
- SQLCHAR szData[MAX_COLUMNS][MAX_ROW_DATA_LEN]={0};
- SQLSMALLINT nIndex,ncol,pfSqlType, pcbScale, pfNullable;
-
- rc = SQLNumResultCols(hstmt,&ncol);
- mystmt(hstmt,rc);
-
- printMessage("\n");
-
- for(nIndex = 1; nIndex <= ncol; nIndex++)
- {
- rc = SQLDescribeCol(hstmt,nIndex,szColName, MAX_NAME_LEN+1, NULL,
- &pfSqlType,&pcColDef,&pcbScale,&pfNullable);
- mystmt(hstmt,rc);
-
- printMessage("%s\t",szColName);
-
- rc = SQLBindCol(hstmt,nIndex, SQL_C_CHAR, szData[nIndex-1],
- MAX_ROW_DATA_LEN+1,NULL);
- mystmt(hstmt,rc);
- }
-
- printMessage("\n------------------------------------------------------\n");
-
- rc = SQLFetch(hstmt);
- while(rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO)
- {
- nRowCount++;
- for(nIndex=0; nIndex< ncol; nIndex++)
- printMessage("%s\t",szData[nIndex]);
-
- printMessage("\n");
- rc = SQLFetch(hstmt);
- }
- SQLFreeStmt(hstmt,SQL_UNBIND);
-
- printMessage("\n total rows fetched:%d\n",nRowCount);
- return(nRowCount);
-}
-/**
- SQLExecDirect
-*/
-SQLRETURN tmysql_exec(SQLHSTMT hstmt, SQLCHAR *sql_stmt)
-{
- return(SQLExecDirect(hstmt,sql_stmt,SQL_NTS));
-}
-/**
- SQLPrepare
-*/
-SQLRETURN tmysql_prepare(SQLHSTMT hstmt, SQLCHAR *sql_stmt)
-{
- return(SQLPrepare(hstmt,sql_stmt,SQL_NTS));
-}
-/**
- return integer data by fetching it
-*/
-SQLINTEGER my_fetch_int(SQLHSTMT hstmt, SQLUSMALLINT irow)
-{
- SQLINTEGER nData;
-
- SQLGetData(hstmt,irow,SQL_INTEGER,&nData,0,NULL);
- printMessage("my_fetch_int:%d\n",nData);
- return(nData);
-}
-/**
- return string data, by fetching it
-*/
-const char *my_fetch_str(SQLHSTMT hstmt, SQLCHAR *szData,SQLUSMALLINT irow)
-{
- SQLINTEGER nLen=0;
-
- SQLGetData(hstmt,irow,SQL_CHAR,szData,MAX_ROW_DATA_LEN+1,&nLen);
- printMessage("my_fetch_str:%s(%d)\n",szData,nLen);
- return((const char *)szData);
-}
-
-#endif /* __TMYODBC__TEST__H */
-
-
Modified: test/include/mytest3.h
===================================================================
--- test/include/mytest3.h 2006-03-01 00:38:45 UTC (rev 37)
+++ test/include/mytest3.h 2006-03-01 06:46:29 UTC (rev 38)
@@ -160,6 +160,8 @@
#define printMessageFooter( A )\
{\
int nDot = g_nCursor;\
+ if ( g_nCursor < 1 )\
+ fprintf( stdout, "\n" );\
for ( ; nDot < 71; nDot++ )\
{\
fprintf( stdout, "." );\
@@ -179,7 +181,7 @@
{
RETCODE lrc;
- if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO )
+ if ( !SQL_SUCCEEDED( rc ) )
{
SQLCHAR szSqlState[6],szErrorMsg[SQL_MAX_MESSAGE_LENGTH];
SQLINTEGER pfNativeError;
@@ -192,9 +194,11 @@
SQL_MAX_MESSAGE_LENGTH-1,
(SQLSMALLINT *)&pcbErrorMsg);
if ( SQL_SUCCEEDED( lrc ) )
- fprintf(stdout,"\n [%s]%s\n",szSqlState,szErrorMsg);
+ fprintf(stdout,"\n\n[%s]%s\n\n",szSqlState,szErrorMsg);
else
- fprintf(stdout," SQLError returned :%d, but rc = %d\n",lrc,rc);
+ fprintf(stdout,"\n\nSQLError returned :%d, but rc = %d\n\n",lrc,rc);
+
+ g_nCursor = 0;
}
}
Modified: test/test32/mytest32.c
===================================================================
--- test/test32/mytest32.c 2006-03-01 00:38:45 UTC (rev 37)
+++ test/test32/mytest32.c 2006-03-01 06:46:29 UTC (rev 38)
@@ -55,7 +55,7 @@
rc = SQLRowCount(hstmt, &pcrow);
mystmt(hstmt,rc);
- fprintf(stdout, "\n affected rows: %ld", pcrow);
+ printMessage( "\n affected rows: %ld", pcrow);
myassert(pcrow == 1);
SQLFreeStmt(hstmt,SQL_RESET_PARAMS);
@@ -74,7 +74,7 @@
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n outdata: %d(%d), %s(%d)",id,length1,name,length2);
+ printMessage( "\n outdata: %d(%d), %s(%d)",id,length1,name,length2);
myassert(id == 100 && length1 == sizeof(SQLINTEGER));
myassert(strcmp(name,"venu")==0 && length2 == 4);
@@ -146,31 +146,31 @@
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n outdata: %s (%ld)", buffer, length);
+ printMessage( "\n outdata: %s (%ld)", buffer, length);
myassert(buffer[0] == '\0' && length == 0);
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n outdata: %s (%ld)", buffer, length);
+ printMessage("\n outdata: %s (%ld)", buffer, length);
myassert(strcmp(buffer,"abc") == 0 && length == 3);
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n outdata: %s (%ld)", buffer, length);
+ printMessage("\n outdata: %s (%ld)", buffer, length);
myassert(strcmp(buffer,"abcdefghij") == 0 && length == 10);
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n outdata: %s (%ld)", buffer, length);
+ printMessage("\n outdata: %s (%ld)", buffer, length);
myassert(strcmp(buffer,"abcdefghi") == 0 && length == 9);
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n outdata: %s (%ld)", buffer, length);
+ printMessage("\n outdata: %s (%ld)", buffer, length);
myassert(strcmp(buffer,"abcdefghij") == 0 && length == 10);
rc = SQLFetch(hstmt);
@@ -214,7 +214,7 @@
rc = SQLRowCount(hstmt, &pcrow);
mystmt(hstmt,rc);
- fprintf(stdout, "\n affected rows: %ld", pcrow);
+ printMessage( "\n affected rows: %ld", pcrow);
myassert(pcrow == 1);
SQLFreeStmt(hstmt,SQL_RESET_PARAMS);
@@ -232,12 +232,12 @@
rc = SQLFetch(hstmt);
mystmt(hstmt,rc);
- fprintf(stdout,"\n str outdata: %s(%d)",name,length);
+ printMessage("\n str outdata: %s(%d)",name,length);
myassert(strcmp(name,"v")==0);
myassert(length == 4);
bin[4]='M';
- fprintf(stdout,"\n bin outdata: %s(%d)",bin,length1);
+ printMessage("\n bin outdata: %s(%d)",bin,length1);
myassert(strncmp(bin,"venuM",5)==0);
myassert(length == 4);
@@ -294,69 +294,69 @@
break;
mystmt(hstmt,rc);
- fprintf(stdout,"\n row %ld : %ld", i, data);
+ printMessage("\n row %ld : %ld", i, data);
myassert(data == i);
}
printMessage("\n total rows fetched: %ld\n", i-1);
myassert( i == max_rows+1);
- fprintf(stdout,"\n scrolling:");
+ printMessage("\n scrolling:");
rc = SQLFetchScroll(hstmt, SQL_FETCH_ABSOLUTE, 3);
mystmt(hstmt,rc);
- fprintf(stdout,"\n absolute 3 : %ld", data);
+ printMessage("\n absolute 3 : %ld", data);
myassert(data == 3);
rc = SQLFetchScroll(hstmt, SQL_FETCH_PREV, 3);
mystmt(hstmt,rc);
- fprintf(stdout,"\n previous : %ld", data);
+ printMessage("\n previous : %ld", data);
myassert(data == 2);
rc = SQLFetchScroll(hstmt, SQL_FETCH_FIRST, 3);
mystmt(hstmt,rc);
- fprintf(stdout,"\n first : %ld", data);
+ printMessage("\n first : %ld", data);
myassert(data == 1);
rc = SQLFetchScroll(hstmt, SQL_FETCH_PREV, 3);
- fprintf(stdout,"\n previous : %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
+ printMessage("\n previous : %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
myassert(rc == SQL_NO_DATA);
rc = SQLFetchScroll(hstmt, SQL_FETCH_RELATIVE, -2);
- fprintf(stdout,"\n relative -2: %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
+ printMessage("\n relative -2: %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
myassert(rc == SQL_NO_DATA);
rc = SQLFetchScroll(hstmt, SQL_FETCH_RELATIVE, 2);
mystmt(hstmt,rc);
- fprintf(stdout,"\n relative 2 : %ld", data);
+ printMessage("\n relative 2 : %ld", data);
myassert(data == 2);
rc = SQLFetchScroll(hstmt, SQL_FETCH_LAST, 3);
mystmt(hstmt,rc);
- fprintf(stdout,"\n last : %ld", data);
+ printMessage("\n last : %ld", data);
myassert(data == 5);
rc = SQLFetchScroll(hstmt, SQL_FETCH_RELATIVE, -2);
mystmt(hstmt,rc);
- fprintf(stdout,"\n relative -2: %ld", data);
+ printMessage("\n relative -2: %ld", data);
myassert(data == 3);
rc = SQLFetchScroll(hstmt, SQL_FETCH_RELATIVE, 3);
- fprintf(stdout,"\n relative -2: %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
+ printMessage("\n relative -2: %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
myassert(rc == SQL_NO_DATA);
rc = SQLFetchScroll(hstmt, SQL_FETCH_NEXT, 3);
- fprintf(stdout,"\n next : %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
+ printMessage("\n next : %s", (rc == SQL_NO_DATA) ? "SQL_NO_DATA" :
"SQL_ERROR;");
myassert(rc == SQL_NO_DATA);
rc = SQLFetchScroll(hstmt, SQL_FETCH_RELATIVE, -2);
mystmt(hstmt,rc);
- fprintf(stdout,"\n relative -2: %ld", data);
+ printMessage("\n relative -2: %ld", data);
myassert(data == 4);
rc = SQLFreeStmt(hstmt,SQL_UNBIND);
@@ -418,27 +418,27 @@
rc = SQLFetch(hstmt);
mystmt(hstmt, rc);
- fprintf(stdout,"\n record 1 : %d", tiny);
+ printMessage("\n record 1 : %d", tiny);
myassert( tiny == 10);
rc = SQLGetData(hstmt,2,SQL_C_LONG,&data,0,NULL);
mystmt(hstmt,rc);
- fprintf(stdout,"\n record 2 : %ld", data);
+ printMessage("\n record 2 : %ld", data);
myassert( data == 10);
name[0]= '\0';
rc = SQLGetData(hstmt,3,SQL_C_CHAR,name,5,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n record 3 : %s(%ld)", name, length);
+ printMessage("\n record 3 : %s(%ld)", name, length);
myassert(strcmp(name,"venu")== 0 && length == 4);
data = 0;
rc = SQLGetData(hstmt,1,SQL_C_LONG,&data,0,NULL);
mystmt(hstmt,rc);
- fprintf(stdout,"\n record 1 : %ld", data);
+ printMessage("\n record 1 : %ld", data);
myassert( data == 10);
rc = SQLFreeStmt(hstmt,SQL_UNBIND);
@@ -478,44 +478,44 @@
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,0,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"M") == 0 && length == 10);
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,4,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"abc") == 0 && length == 10);
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,4,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"def") == 0 && length == 7);
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,4,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"ghi") == 0 && length == 4);
data[0]= 'M';
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,0,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(data[0] == 'M' && length == 1);
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,1,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(data[0] == '\0' && length == 1);
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,2,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"j") == 0 && length == 1);
rc = SQLGetData(hstmt,1,SQL_C_CHAR,data,2,&length);
@@ -525,44 +525,44 @@
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,0,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"M") == 0 && length == 5);
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,3,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"12") == 0 && length == 5);
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,2,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"3") == 0 && length == 3);
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,2,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"4") == 0 && length == 2);
data[0]= 'M';
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,0,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(data[0] == 'M' && length == 1);
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,1,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(data[0] == '\0' && length == 1);
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,2,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n data: %s (%ld)", data, length);
+ printMessage("\n data: %s (%ld)", data, length);
myassert(strcmp(data,"5") == 0 && length == 1);
rc = SQLGetData(hstmt,2,SQL_C_CHAR,data,2,&length);
@@ -628,7 +628,7 @@
rc = SQLGetData(hstmt,13,SQL_C_CHAR,table,10,&length);
mystmt(hstmt,rc);
- fprintf(stdout,"\n table: %s(%d)", table, length);
+ printMessage("\n table: %s(%d)", table, length);
myassert(strcmp(table,"100") == 0 && length == 3);
rc = SQLFetch(hstmt);
@@ -662,7 +662,7 @@
rc = SQLFetchScroll(hstmt, SQL_FETCH_FIRST, 0);
while ( rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO)
{
- fprintf(stdout,"\n system table %d: '%s'", ++row_count, sys_table);
+ printMessage( "\n system table %d: '%s'", ++row_count, sys_table);
rc = SQLColumns(hstmt_x,NULL,0,NULL,0,sys_table,SQL_NTS,NULL,0);
mystmt(hstmt_x,rc);
@@ -675,7 +675,7 @@
break;
columns++;
}
- fprintf(stdout," columns: '%ld'", columns);
+ printMessage(" columns: '%ld'", columns);
SQLFreeStmt(hstmt_x,SQL_CLOSE);
if (grants_ok)
@@ -715,7 +715,7 @@
rc = SQLNumResultCols(hstmt, &ncols);
mystmt(hstmt,rc);
- fprintf(stdout,"\n total columns: %d", ncols);
+ printMessage("\n total columns: %d", ncols);
myassert(ncols == 18);
myassert(myresult(hstmt) == 2);
@@ -733,7 +733,7 @@
rc = SQLDescribeCol(hstmt, i, name, MYSQL_NAME_LEN+1, &len, NULL, NULL, NULL,
NULL);
mystmt(hstmt,rc);
- fprintf(stdout,"\n column %d: %s (%d)", i, name, len);
+ printMessage("\n column %d: %s (%d)", i, name, len);
myassert(strcmp(name,colnames[i-1]) == 0 && len == collengths[i-1]);
}
SQLFreeStmt(hstmt,SQL_CLOSE);
@@ -873,7 +873,7 @@
if (!mysql_min_version(hdbc, "5.0",3))
{
- fprintf(stdout,"\n server doesn't support stored procedures..skipped");
+ printMessage("\n server doesn't support stored procedures..skipped");
return;
}
@@ -923,7 +923,7 @@
rc = SQLFetch(hstmt);
mystmt(hstmt, rc);
- fprintf(stdout, "\n data: %d, %s(%d)", a, b1, length);
+ printMessage( "\n data: %d, %s(%d)", a, b1, length);
myassert( a == a1);
myassert(strncmp(b1,b,length1) == 0 && length1 == length);
}
Modified: test/unixodbc/my_unixodbc.c
===================================================================
--- test/unixodbc/my_unixodbc.c 2006-03-01 00:38:45 UTC (rev 37)
+++ test/unixodbc/my_unixodbc.c 2006-03-01 06:46:29 UTC (rev 38)
@@ -124,7 +124,7 @@
if (rc == SQL_SUCCESS)
{
mycon(hdbc,rc);
- fprintf(stdout, "output string: `%s`", conn_out);
+ printMessage( "output string: `%s`", conn_out);
rc = SQLDisconnect(hdbc);
mycon(hdbc,rc);
Modified: test/use_result/use_result.pro
===================================================================
--- test/use_result/use_result.pro 2006-03-01 00:38:45 UTC (rev 37)
+++ test/use_result/use_result.pro 2006-03-01 06:46:29 UTC (rev 38)
@@ -24,7 +24,7 @@
# #########################################################
HEADERS += \
..\include\my_utility.h \
- ..\include\mytest3.h
+ ..\include\mytest3.h
SOURCES += \
my_use_result.c
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r38 - in test: include test32 unixodbc use_result | pharvey | 1 Mar |
