| List: | Commits | « Previous MessageNext Message » | |
| From: | jwinstead | Date: | December 1 2007 8:48am |
| Subject: | Connector/ODBC 3.51 commit: r906 - branches/guffert/test | ||
| View as plain text | |||
Modified: branches/guffert/test/my_unicode.c branches/guffert/test/odbctap.h Log: Fix my_unicode tests to not use hard-coded DSN, UID, and PWD. Modified: branches/guffert/test/my_unicode.c =================================================================== --- branches/guffert/test/my_unicode.c 2007-12-01 06:55:51 UTC (rev 905) +++ branches/guffert/test/my_unicode.c 2007-12-01 07:47:59 UTC (rev 906) @@ -31,9 +31,9 @@ ok_env(henv, SQLAllocConnect(henv, &hdbc1)); ok_con(hdbc1, SQLConnectW(hdbc1, - W(L"myodbc3"), SQL_NTS, - W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + WC(mydsn), SQL_NTS, + WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLDisconnect(hdbc1)); ok_con(hdbc1, SQLFreeConnect(hdbc1)); @@ -50,9 +50,9 @@ ok_env(henv, SQLAllocConnect(henv, &hdbc1)); ok_con(hdbc1, SQLConnectW(hdbc1, - W(L"myodbc3"), SQL_NTS, - W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + WC(mydsn), SQL_NTS, + WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc, SQLAllocStmt(hdbc1, &hstmt1)); @@ -172,9 +172,9 @@ ok_env(henv, SQLAllocConnect(henv, &hdbc1)); ok_con(hdbc1, SQLConnectW(hdbc1, - W(L"myodbc3"), SQL_NTS, - W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + WC(mydsn), SQL_NTS, + WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc, SQLAllocStmt(hdbc1, &hstmt1)); ok_stmt(hstmt1, SQLPrepareW(hstmt1, W(L"SELECT ? FROM DUAL"), SQL_NTS)); @@ -270,9 +270,9 @@ ok_env(henv, SQLAllocConnect(henv, &hdbc1)); ok_con(hdbc1, SQLConnectW(hdbc1, - W(L"myodbc3"), SQL_NTS, - W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + WC(mydsn), SQL_NTS, + WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLNativeSqlW(hdbc1, W(in), SQL_NTS, out, sizeof(out), &len)); is_num(len, sizeof(in) / sizeof(wchar_t) - 1); @@ -305,8 +305,8 @@ ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE)); ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -401,8 +401,8 @@ ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt2)); @@ -462,8 +462,8 @@ SQLSMALLINT len; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -508,8 +508,8 @@ SQLSMALLINT len; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -552,8 +552,8 @@ SQLINTEGER len; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -586,8 +586,8 @@ HSTMT hstmt1; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -636,8 +636,8 @@ HSTMT hstmt1; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -682,8 +682,8 @@ SQLWCHAR wbuff[MAX_ROW_DATA_LEN+1]; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -721,8 +721,8 @@ SQLWCHAR wbuff[MAX_ROW_DATA_LEN+1]; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -764,8 +764,8 @@ SQLWCHAR wbuff[MAX_ROW_DATA_LEN+1]; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -808,8 +808,8 @@ skip("can't test foreign keys with 5.1 or later yet"); ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -865,8 +865,8 @@ SQLWCHAR wbuff[MAX_ROW_DATA_LEN+1]; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); @@ -906,8 +906,8 @@ SQLWCHAR wbuff[MAX_ROW_DATA_LEN+1]; ok_env(henv, SQLAllocConnect(henv, &hdbc1)); - ok_con(hdbc1, SQLConnectW(hdbc1, W(L"myodbc3"), SQL_NTS, W(L"root"), SQL_NTS, - W(L""), SQL_NTS)); + ok_con(hdbc1, SQLConnectW(hdbc1, WC(mydsn), SQL_NTS, WC(myuid), SQL_NTS, + WC(mypwd), SQL_NTS)); ok_con(hdbc1, SQLAllocStmt(hdbc1, &hstmt1)); Modified: branches/guffert/test/odbctap.h =================================================================== --- branches/guffert/test/odbctap.h 2007-12-01 06:55:51 UTC (rev 905) +++ branches/guffert/test/odbctap.h 2007-12-01 07:47:59 UTC (rev 906) @@ -1031,6 +1031,28 @@ /** + Helper for converting a (char *) to a (SQLWCHAR *) +*/ +#define WC(string) dup_char_as_sqlwchar((string)) + + +/** + Convert a char * to a SQLWCHAR *. New space is allocated and never freed. + Because this is used in short-lived test programs, this is okay, if not + ideal. +*/ +SQLWCHAR *dup_char_as_sqlwchar(SQLCHAR *from) +{ + SQLWCHAR *to= malloc(strlen((char *)from) * sizeof(SQLWCHAR) + 1); + SQLWCHAR *out= to; + while (from && *from) + *(to++)= (SQLWCHAR)*(from++); + *to= 0; + return out; +} + + +/** Check if we are using a driver manager for testing. @param[in] hdbc Connection handle
| Thread | ||
|---|---|---|
| • Connector/ODBC 3.51 commit: r906 - branches/guffert/test | jwinstead | 1 Dec |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.121 sec. using MySQL 5.1.14-beta-log