Modified:
trunk/driver/catalog.c
trunk/test/my_blob.c
trunk/test/my_result.c
trunk/test/odbctap.h
Log:
Remove use of my_assert and myerror from odbctap.h
Modified: trunk/driver/catalog.c
===================================================================
--- trunk/driver/catalog.c 2007-08-28 00:01:12 UTC (rev 703)
+++ trunk/driver/catalog.c 2007-08-28 18:08:57 UTC (rev 704)
@@ -93,9 +93,7 @@
@purpose : appends wild card to the query
*/
-static void my_append_wild(char *to,
- char *end,
- const char *wild)
+static char *my_append_wild(char *to, char *end, const char *wild)
{
end-= 5; /* Some extra */
to= strmov(to," like '");
@@ -110,8 +108,10 @@
}
}
*to++= '%'; /* Nicer this way */
- to[0]= '\'';
- to[1]= 0;
+ *to++= '\'';
+ *to= '\0';
+
+ return to;
}
@@ -1159,15 +1159,15 @@
const char *table)
{
MYSQL FAR *mysql= &dbc->mysql;
- char buff[255+2*NAME_LEN+1];
+ char buff[255+2*NAME_LEN+1], *pos;
- my_append_wild(strmov(buff,
- "SELECT Db,User,Table_name,Grantor,Table_priv\
- FROM mysql.tables_priv WHERE Table_name"),
- buff+sizeof(buff),table);
- strxmov(buff,buff," AND Db",NullS);
- my_append_wild(strmov(buff,buff),buff+sizeof(buff),qualifier);
- strxmov(buff,buff," ORDER BY Db,Table_name,Table_priv,User",NullS);
+ pos= my_append_wild(strmov(buff,
+ "SELECT Db,User,Table_name,Grantor,Table_priv "
+ "FROM mysql.tables_priv WHERE Table_name"),
+ buff + sizeof(buff), table);
+ pos= strxmov(pos, " AND Db", NullS);
+ pos= my_append_wild(pos, buff + sizeof(buff), qualifier);
+ pos= strxmov(pos, " ORDER BY Db,Table_name,Table_priv,User", NullS);
MYLOG_DBC_QUERY(dbc, buff);
if (mysql_query(mysql,buff))
@@ -1313,26 +1313,29 @@
const char *table,
const char *column)
{
- char buff[255+3*NAME_LEN+1];
+ char buff[255+3*NAME_LEN+1], *pos;
- my_append_wild(strmov(buff,
- "SELECT c.Db, c.User,c.Table_name,c.Column_name,\
- t.Grantor,c.Column_priv,t.Table_priv FROM mysql.columns_priv as c,\
- mysql.tables_priv as t WHERE c.Table_name"),
- buff+sizeof(buff),table);
- strxmov(buff,buff," AND c.Db",NullS);
- my_append_wild(strmov(buff,buff),buff+sizeof(buff),qualifier);
- strxmov(buff,buff," AND c.Column_name",NullS);
- my_append_wild(strmov(buff,buff),buff+sizeof(buff),column);
- strxmov(buff,buff," AND c.Table_name=t.Table_name",
- " ORDER BY c.Db,c.Table_name,c.Column_name,c.Column_priv", NullS);
+ pos= my_append_wild(strmov(buff,
+ "SELECT c.Db, c.User,c.Table_name,c.Column_name,"
+ "t.Grantor,c.Column_priv,t.Table_priv "
+ "FROM mysql.columns_priv as c,"
+ "mysql.tables_priv as t WHERE c.Table_name"),
+ buff + sizeof(buff), table);
+ pos= strxmov(pos, " AND c.Db", NullS);
+ pos= my_append_wild(pos, buff + sizeof(buff), qualifier);
+ pos= strxmov(pos, " AND c.Column_name", NullS);
+ pos= my_append_wild(pos, buff + sizeof(buff), column);
+ pos= strxmov(pos, " AND c.Table_name=t.Table_name",
+ " ORDER BY c.Db,c.Table_name,c.Column_name,c.Column_priv",
+ NullS);
- if ( mysql_query(mysql,buff) )
- return NULL;
+ if (mysql_query(mysql, buff))
+ return NULL;
- return mysql_store_result(mysql);
+ return mysql_store_result(mysql);
}
+
char *SQLCOLUMNS_priv_values[]=
{
NULL,"",NULL,NULL,NULL,NULL,NULL,NULL
Modified: trunk/test/my_blob.c
===================================================================
--- trunk/test/my_blob.c 2007-08-28 00:01:12 UTC (rev 703)
+++ trunk/test/my_blob.c 2007-08-28 18:08:57 UTC (rev 704)
@@ -65,8 +65,8 @@
rc = SQLExecute(hstmt);
mystmt_err(hstmt,rc == SQL_NEED_DATA, rc);
- rc = SQLParamData(hstmt, &token);
- if (rc == SQL_NEED_DATA)
+
+ expect_stmt(hstmt, SQLParamData(hstmt, &token), SQL_NEED_DATA);
{
for (j = 0; j < blob_size; )
{
@@ -85,10 +85,6 @@
rc = SQLParamData(hstmt, &token);
mystmt(hstmt,rc);
}
- else
- {
- my_error();
- }
finish = clock();
duration = (finish-start)/CLOCKS_PER_SEC;
Modified: trunk/test/my_result.c
===================================================================
--- trunk/test/my_result.c 2007-08-28 00:01:12 UTC (rev 703)
+++ trunk/test/my_result.c 2007-08-28 18:08:57 UTC (rev 704)
@@ -593,8 +593,8 @@
pcbValue= 99;
szData[0]='A';
- rc = SQLGetData(hstmt,2,SQL_C_CHAR,szData,0,&pcbValue);
- myassert(rc == SQL_SUCCESS_WITH_INFO);
+ expect_stmt(hstmt, SQLGetData(hstmt, 2, SQL_C_CHAR, szData, 0, &pcbValue),
+ SQL_SUCCESS_WITH_INFO);
fprintf(stdout,"data : %s (%ld)\n",szData,pcbValue);
myassert(pcbValue == 0);
myassert(szData[0] == 'A');
Modified: trunk/test/odbctap.h
===================================================================
--- trunk/test/odbctap.h 2007-08-28 00:01:12 UTC (rev 703)
+++ trunk/test/odbctap.h 2007-08-28 18:08:57 UTC (rev 704)
@@ -441,124 +441,83 @@
}
-/* PROTOTYPE */
-void myerror( SQLRETURN rc, SQLSMALLINT htype, SQLHANDLE handle, const char *szFile, int
nLine );
-
-#define my_error() fprintf(stdout," ERROR occured at %d@%s\n",__LINE__,__FILE__)
-
SQLUINTEGER myresult(SQLHSTMT hstmt);
/* UTILITY MACROS */
#define myenv(henv,r) \
- if ( ((r) != SQL_SUCCESS) ) \
- myerror( r, 1, henv, __FILE__, __LINE__ ); \
- my_assert( ((r) == SQL_SUCCESS) || ((r) == SQL_SUCCESS_WITH_INFO) )
+ do { \
+ print_diag(r, SQL_HANDLE_ENV, (henv), "myenv(henv,r)", \
+ __FILE__, __LINE__); \
+ if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) \
+ return FAIL; \
+ } while (0)
#define myenv_r(henv,r) \
- if ( r == SQL_ERROR ) \
- myerror( r, 1, henv, __FILE__, __LINE__ ); \
- my_assert( r == SQL_ERROR )
+ do { \
+ print_diag(r, SQL_HANDLE_ENV, (henv), "myenv(henv_r,r)", \
+ __FILE__, __LINE__); \
+ if (r != SQL_ERROR) \
+ return FAIL; \
+ } while (0)
#define myenv_err(henv,r,rc) \
- if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO ) \
- myerror( rc, 1, henv, __FILE__, __LINE__ ); \
- my_assert( r )
+ do { \
+ print_diag(rc, SQL_HANDLE_ENV, (henv), "myenv_err(henv,r)",\
+ __FILE__, __LINE__); \
+ if (!r) \
+ return FAIL; \
+ } while (0)
#define mycon(hdbc,r) \
- if ( ((r) != SQL_SUCCESS) ) \
- myerror( r, 2, hdbc, __FILE__, __LINE__ ); \
- my_assert( ((r) == SQL_SUCCESS) || ((r) == SQL_SUCCESS_WITH_INFO) )
+ do { \
+ print_diag(r, SQL_HANDLE_DBC, (hdbc), "mycon(hdbc,r)", \
+ __FILE__, __LINE__); \
+ if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) \
+ return FAIL; \
+ } while (0)
#define mycon_r(hdbc,r) \
- if ( r == SQL_ERROR ) \
- myerror( r, 2, hdbc, __FILE__, __LINE__ ); \
- my_assert(r==SQL_ERROR)
+ do { \
+ print_diag(r, SQL_HANDLE_DBC, (hdbc), "mycon_r(hdbc,r)", \
+ __FILE__, __LINE__); \
+ if (r != SQL_ERROR) \
+ return FAIL; \
+ } while (0)
#define mycon_err(hdbc,r,rc) \
- if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO ) \
- myerror( rc, 2, hdbc, __FILE__, __LINE__ ); \
- my_assert( r )
+ do { \
+ print_diag(rc, SQL_HANDLE_DBC, (hdbc), "mycon_err(hdbc,r)", \
+ __FILE__, __LINE__); \
+ if (!r) \
+ return FAIL; \
+ } while (0)
-#define mystmt(hstmt,r) \
- if ( ((r) != SQL_SUCCESS) ) \
- myerror( r, 3, hstmt, __FILE__, __LINE__ ); \
- my_assert( ((r) == SQL_SUCCESS) || ((r) == SQL_SUCCESS_WITH_INFO) )
+#define mystmt(hdbc,r) \
+ do { \
+ print_diag(r, SQL_HANDLE_DBC, (hdbc), "mystmt(hdbc,r)", \
+ __FILE__, __LINE__); \
+ if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) \
+ return FAIL; \
+ } while (0)
-#define mystmt_r(hstmt,r) \
- if ( r == SQL_ERROR ) \
- myerror( r, 3, hstmt, __FILE__, __LINE__ ); \
- my_assert( r == SQL_ERROR )
+#define mystmt_r(hdbc,r) \
+ do { \
+ print_diag(r, SQL_HANDLE_DBC, (hdbc), "mystmt_r(hdbc,r)", \
+ __FILE__, __LINE__); \
+ if (r != SQL_ERROR) \
+ return FAIL; \
+ } while (0)
-#define mystmt_err(hstmt,r,rc) \
- if ( rc == SQL_ERROR || rc == SQL_SUCCESS_WITH_INFO ) \
- myerror( rc, 3, hstmt, __FILE__, __LINE__ ); \
- my_assert( r )
+#define mystmt_err(hdbc,r,rc) \
+ do { \
+ print_diag(rc, SQL_HANDLE_DBC, (hdbc), "mystmt_err(hdbc,r)", \
+ __FILE__, __LINE__); \
+ if (!r) \
+ return FAIL; \
+ } while (0)
-#if defined(USE_C99_FUNC_MACRO)
-#define printMessageHeader()\
- {\
- g_nCursor = sprintf( g_szHeader, "[%s][%s][%d]\n", __FILE__, __func__, __LINE__
);\
- fprintf( stdout, g_szHeader );\
- }
-#elif defined(USE_GNU_FUNC_MACRO)
-#define printMessageHeader()\
- {\
- g_nCursor = sprintf( g_szHeader, "[%s][%s][%d]\n", __FILE__, __FUNCTION__,
__LINE__ );\
- fprintf( stdout, g_szHeader );\
- }
-#else
-#define printMessageHeader()\
- {\
- g_nCursor = sprintf( g_szHeader, "[%s][%d]\n", __FILE__, __LINE__ );\
- fprintf( stdout, g_szHeader );\
- }
-#endif
-#define printMessageFooter( A )\
- {\
- int nDot = g_nCursor;\
- if ( g_nCursor < 1 )\
- fprintf( stdout, "\n" );\
- for ( ; nDot < 71; nDot++ )\
- {\
- fprintf( stdout, "." );\
- }\
- if ( A )\
- fprintf( stdout, "[ OK ]\n" );\
- else\
- fprintf( stdout, "[FAILED]\n" );\
- }
-
-
/**
-ERROR HANDLER
-*/
-void myerror( SQLRETURN rc, SQLSMALLINT htype, SQLHANDLE handle, const char *szFile, int
nLine )
-{
- RETCODE lrc;
-
- if ( !SQL_SUCCEEDED( rc ) )
- {
- SQLCHAR szSqlState[6],szErrorMsg[SQL_MAX_MESSAGE_LENGTH];
- SQLINTEGER pfNativeError;
- SQLSMALLINT pcbErrorMsg;
-
- lrc = SQLGetDiagRec(htype, handle,1,
- (SQLCHAR *)&szSqlState,
- (SQLINTEGER *)&pfNativeError,
- (SQLCHAR *)&szErrorMsg,
- SQL_MAX_MESSAGE_LENGTH-1,
- (SQLSMALLINT *)&pcbErrorMsg);
- if ( SQL_SUCCEEDED( lrc ) )
- fprintf( stdout, "\n\n[%s][%d][%s]%s\n\n", szFile, nLine, szSqlState,
szErrorMsg );
- else
- fprintf( stdout, "\n\n[%s][%d] SQLGetDiagRec returned :%d, but rc = %d\n\n",
szFile, nLine, lrc, rc );
-
- g_nCursor = 0;
- }
-}
-
-/**
Print resultset dashes
*/
static void my_print_dashes(SQLHSTMT hstmt, SQLSMALLINT nCol)
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r704 - in trunk: driver test | jwinstead | 28 Aug |
