| List: | Commits | « Previous MessageNext Message » | |
| From: | mysqldev | Date: | September 20 2006 2:36am |
| Subject: | Connector/ODBC 3.51 commit: r108 - in trunk/test: . catalog col_length dyn_cursor keys test3 test32 tran_ext unixodbc use_result | ||
| View as plain text | |||
Modified: trunk/test/Makefile.am trunk/test/catalog/my_catalog.c trunk/test/col_length/my_col_length.c trunk/test/dyn_cursor/my_dyn_cursor.c trunk/test/keys/my_keys.c trunk/test/test3/mytest3.c trunk/test/test32/mytest32.c trunk/test/tran_ext/my_tran_ext.c trunk/test/unixodbc/my_unixodbc.c trunk/test/use_result/my_use_result.c Log: Added socket option to the test programs Modified: trunk/test/Makefile.am =================================================================== --- trunk/test/Makefile.am 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/Makefile.am 2006-09-20 00:36:07 UTC (rev 108) @@ -104,9 +104,9 @@ trun: make-test-ini $(fancy_tests) for test in $(fancy_tests); do \ echo ODBCINI=$(TEST_ODBCINI) \ - ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" || exit 1; \ + ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit 1; \ ODBCINI=$(TEST_ODBCINI) \ - ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" || exit 1; \ + ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit 1; \ done # Modified: trunk/test/catalog/my_catalog.c =================================================================== --- trunk/test/catalog/my_catalog.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/catalog/my_catalog.c 2006-09-20 00:36:07 UTC (rev 108) @@ -16,6 +16,7 @@ ***************************************************************************/ #include "mytest3.h" +SQLCHAR *mysock= NULL; /** * to test the pcbValue on cursor ops @@ -718,9 +719,16 @@ myuid = argv[2]; else if ( narg == 3 ) mypwd = argv[3]; + else if ( narg == 4 ) + mysock= argv[4]; } - sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=3;",mydsn,myuid,mypwd); + sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=3",mydsn,myuid,mypwd); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } mydrvconnect(&henv,&hdbc,&hstmt,conn); my_columns_null(hdbc,hstmt); Modified: trunk/test/col_length/my_col_length.c =================================================================== --- trunk/test/col_length/my_col_length.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/col_length/my_col_length.c 2006-09-20 00:36:07 UTC (rev 108) @@ -45,7 +45,7 @@ rc = SQLAllocStmt(hdbc,&hstmt); mycon(hdbc,rc); /* PMG 2004.05.04 Added this in order for the test to pass. */ - sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd); + sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd); rc = SQLExecDirect(hstmt,"CREATE DATABASE IF NOT EXISTS client_odbc_test",SQL_NTS); mystmt(hstmt,rc); Modified: trunk/test/dyn_cursor/my_dyn_cursor.c =================================================================== --- trunk/test/dyn_cursor/my_dyn_cursor.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/dyn_cursor/my_dyn_cursor.c 2006-09-20 00:36:07 UTC (rev 108) @@ -16,6 +16,8 @@ ***************************************************************************/ #include "mytest3.h" +SQLCHAR *mysock= NULL; + /******************************************************** * perform positioned update and delete * *********************************************************/ @@ -1029,9 +1031,16 @@ myuid = argv[2]; else if ( narg == 3 ) mypwd = argv[3]; + else if ( narg == 4 ) + mysock= argv[4]; } sprintf(conn,"DRIVER=MyODBC;DSN=%s;USER=%s;PASSWORD=%s;OPTION=35",mydsn,myuid,mypwd); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } mydrvconnect(&henv,&hdbc,&hstmt,conn); if (driver_supports_setpos(hdbc)) { Modified: trunk/test/keys/my_keys.c =================================================================== --- trunk/test/keys/my_keys.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/keys/my_keys.c 2006-09-20 00:36:07 UTC (rev 108) @@ -16,6 +16,7 @@ ***************************************************************************/ #include "mytest3.h" +SQLCHAR *mysock= NULL; /* UPDATE with primary keys ... @@ -1045,9 +1046,13 @@ rc = SQLExecDirect(hstmt,"CREATE DATABASE my_tables_test_db",SQL_NTS); mystmt(hstmt,rc); - sprintf(conn,"DRIVER={MySQL ODBC 3.51 Driver};DSN=%s;UID=%s;PASSWORD=%s;DATABASE=%s", + sprintf(conn,"DRIVER={MySQL ODBC 3.51 Driver};DSN=%s;UID=%s;PASSWORD=%s;DATABASE=%s", mydsn,myuid,mypwd,"my_tables_test_db"); - + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } rc = SQLAllocConnect(henv,&hdbc1); myenv(henv,rc); @@ -1197,6 +1202,8 @@ myuid = argv[2]; else if ( narg == 3 ) mypwd = argv[3]; + else if ( narg == 4 ) + mysock= argv[4]; } myconnect(&henv,&hdbc,&hstmt); Modified: trunk/test/test3/mytest3.c =================================================================== --- trunk/test/test3/mytest3.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/test3/mytest3.c 2006-09-20 00:36:07 UTC (rev 108) @@ -16,6 +16,8 @@ ***************************************************************************/ #include "mytest3.h" +SQLCHAR *mysock= NULL; + /* Utility function to verify a particular column data */ @@ -5055,8 +5057,13 @@ printMessageHeader(); - sprintf(conn,"DSN=%s;USER=%s;PASSWORD=%s;OPTION=1048579", + sprintf(conn,"DRIVER=MyODBC;DSN=%s;USER=%s;PASSWORD=%s;OPTION=1048579", mydsn,myuid,mypwd); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } mydrvconnect(&henv,&hdbc,&hstmt1,conn); tmysql_exec(hstmt1,"drop table t_cache"); @@ -5142,8 +5149,13 @@ printMessageHeader(); - sprintf(conn,"DSN=%s;USER=%s;PASSWORD=%s;OPTION=3", + sprintf(conn,"DRIVER=MyODBC;DSN=%s;USER=%s;PASSWORD=%s;OPTION=3", mydsn,myuid,mypwd); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } mydrvconnect(&henv,&hdbc,&hstmt1,conn); tmysql_exec(hstmt1,"drop table t_cache"); @@ -6872,11 +6884,12 @@ ) { fprintf(stdout,"------------------------------------------\n"); - fprintf(stdout,"usage: mytest3 testno [DSN] [UID] [PWD] \n\n"); + fprintf(stdout,"usage: mytest3 testno [DSN] [UID] [PWD] [SOCK]\n\n"); fprintf(stdout," testno <-- test number\n"); fprintf(stdout," DSN <-- data source name\n"); fprintf(stdout," UID <-- user name\n"); fprintf(stdout," PWD <-- password\n"); + fprintf(stdout," SOCK <-- socket path\n"); fprintf(stdout,"\ntestno:\n"); fprintf(stdout," -1 : all\n"); @@ -6910,8 +6923,9 @@ else if ( narg == 3 ) myuid = argv[3]; else if ( narg == 4 ) - mypwd = argv[4]; - + mypwd = argv[4]; + else if ( narg == 4 ) + mysock= argv[4]; } myconnect(&henv,&hdbc,&hstmt); Modified: trunk/test/test32/mytest32.c =================================================================== --- trunk/test/test32/mytest32.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/test32/mytest32.c 2006-09-20 00:36:07 UTC (rev 108) @@ -374,7 +374,8 @@ void t_prep_getdata() { SQLCHAR name[10]; - long data, length; + long data; + SQLINTEGER length; SQLCHAR tiny; SQLExecDirect(hstmt,"drop table t_prep_getdata",SQL_NTS); @@ -432,7 +433,12 @@ rc = SQLGetData(hstmt,3,SQL_C_CHAR,name,5,&length); mystmt(hstmt,rc); - printMessage("\n record 3 : %s(%ld)", name, length); + /* + FIXME how to do this test nicely? We don't know if SQLINTEGER is + 32 or 64 bits, and to use "%d" or "%ld"? Microsoft changed this. + */ + printMessage("\n record 3 : %s(%d)", name, length); + myassert(strcmp(name,"venu")== 0 && length == 4); data = 0; Modified: trunk/test/tran_ext/my_tran_ext.c =================================================================== --- trunk/test/tran_ext/my_tran_ext.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/tran_ext/my_tran_ext.c 2006-09-20 00:36:07 UTC (rev 108) @@ -24,6 +24,7 @@ #include "mytest3.h" /* MyODBC 3.51 sample utility header */ +SQLCHAR *mysock= NULL; /******************************************************** * Transactional behaviour before and the connection * @@ -42,20 +43,28 @@ rc = SQLSetConnectAttr(hdbc,SQL_TXN_ISOLATION,(SQLPOINTER)SQL_TXN_REPEATABLE_READ,0); mycon(hdbc,rc); - sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=%d;", + sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=%d", mydsn,myuid,mypwd,option); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } rc = SQLDriverConnect(hdbc,NULL,conn,255, NULL,0,NULL,SQL_DRIVER_COMPLETE); mycon(hdbc,rc); - my_assert(rc == SQL_SUCCESS_WITH_INFO); - rc = SQLDisconnect(hdbc); mycon(hdbc,rc); option = 1 + 4; - sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=%d;", + sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=%d", mydsn,myuid,mypwd,option); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } rc = SQLDriverConnect(hdbc,NULL,conn,255, NULL,0,NULL,SQL_DRIVER_COMPLETE); mycon(hdbc,rc); @@ -89,7 +98,8 @@ myuid = argv[2]; else if ( narg == 3 ) mypwd = argv[3]; - + else if ( narg == 4 ) + mysock= argv[4]; } rc = SQLAllocHandle(SQL_HANDLE_ENV,SQL_NULL_HANDLE,&henv); myenv(henv,rc); Modified: trunk/test/unixodbc/my_unixodbc.c =================================================================== --- trunk/test/unixodbc/my_unixodbc.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/unixodbc/my_unixodbc.c 2006-09-20 00:36:07 UTC (rev 108) @@ -16,6 +16,8 @@ ***************************************************************************/ #include "mytest3.h" +SQLCHAR *mysock= NULL; + void t_odbc3_envattr() { SQLRETURN rc; @@ -110,9 +112,14 @@ rc = SQLAllocConnect(henv,&hdbc); myenv(henv,rc); - sprintf(conn_in,"DRIVER={MySQL ODBC 3.51 Driver};USER=%s;PASSWORD=%s;DATABASE=%s;SERVER=%s;OPTION=3;SOCKET=/tmp/mysql.sock;STMT=use mysql;", + sprintf(conn_in,"DRIVER={MySQL ODBC 3.51 Driver};USER=%s;PASSWORD=%s;" + "DATABASE=%s;SERVER=%s;OPTION=3;STMT=use mysql", myuid, mypwd, mydb, myserver); - + if (mysock != NULL) + { + strcat(conn_in, ";SOCKET="); + strcat(conn_in, mysock); + } rc = SQLDriverConnect(hdbc, (SQLHWND)0, (SQLCHAR *)conn_in, sizeof(conn_in), (SQLCHAR *)conn_out, sizeof(conn_out), 0, SQL_DRIVER_NOPROMPT); @@ -156,7 +163,8 @@ myuid = argv[2]; else if ( narg == 3 ) mypwd = argv[3]; - + else if ( narg == 4 ) + mysock= argv[4]; } t_odbc3_envattr(); Modified: trunk/test/use_result/my_use_result.c =================================================================== --- trunk/test/use_result/my_use_result.c 2006-09-19 23:11:57 UTC (rev 107) +++ trunk/test/use_result/my_use_result.c 2006-09-20 00:36:07 UTC (rev 108) @@ -16,6 +16,8 @@ ***************************************************************************/ #include "mytest3.h" +SQLCHAR *mysock= NULL; + SQLINTEGER my_max_rows = 10000; clock_t t_start, t_end; SQLDOUBLE my_time; @@ -146,8 +148,13 @@ SQLCHAR conn[255]; SQLINTEGER option = 131072L * 8; - sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=%d;", + sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=%d", mydsn,myuid,mypwd,option); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } mydrvconnect(&henv1,&hdbc1,&hstmt1,conn); my_assert(t_fetch_data(hdbc1,hstmt1) == my_max_rows); mydisconnect(&henv1,&hdbc1,&hstmt1); @@ -164,8 +171,13 @@ SQLCHAR conn[255]; SQLINTEGER option = 3; - sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=%d;", + sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=%d", mydsn,myuid,mypwd,option); + if (mysock != NULL) + { + strcat(conn, ";SOCKET="); + strcat(conn, mysock); + } mydrvconnect(&henv1,&hdbc1,&hstmt1,conn); my_assert(t_fetch_data(hdbc1,hstmt1) == my_max_rows); mydisconnect(&henv1,&hdbc1,&hstmt1); @@ -188,12 +200,14 @@ { if ( narg == 1 ) my_max_rows = atoi(argv[1]); - if ( narg == 2 ) + else if ( narg == 2 ) mydsn = argv[2]; else if ( narg == 3 ) myuid = argv[3]; else if ( narg == 4 ) mypwd = argv[4]; + else if ( narg == 4 ) + mysock= argv[4]; } t_init_data();
| Thread | ||
|---|---|---|
| • Connector/ODBC 3.51 commit: r108 - in trunk/test: . catalog col_length dyn_cursor keys test3 test32 tran_ext unixodbc use_result | mysqldev | 20 Sep |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.458 sec. using MySQL 5.1.14-beta-log