Removed:
trunk/test/my_col_length.c
Modified:
trunk/test/
trunk/test/Makefile.am
trunk/test/my_result.c
Log:
Remove my_col_length -- it had two identical tests, and one has now been
moved into my_result (after an odbctap conversion).
Property changes on: trunk/test
___________________________________________________________________
Name: svn:ignore
- .deps
.libs
Makefile
Makefile.in
my_basics
my_blob
my_bulk
my_catalog
my_col_length
my_curext
my_cursor
my_datetime
my_dyn_cursor
my_error
my_info
my_keys
my_param
my_position
my_prepare
my_relative
my_result
my_scroll
my_tran
my_types
my_unixodbc
my_use_result
odbc.ini
odbcinst.ini
+ .deps
.libs
Makefile
Makefile.in
my_basics
my_blob
my_bulk
my_catalog
my_curext
my_cursor
my_datetime
my_dyn_cursor
my_error
my_info
my_keys
my_param
my_position
my_prepare
my_relative
my_result
my_scroll
my_tran
my_types
my_unixodbc
my_use_result
odbc.ini
odbcinst.ini
Modified: trunk/test/Makefile.am
===================================================================
--- trunk/test/Makefile.am 2007-04-10 23:09:14 UTC (rev 311)
+++ trunk/test/Makefile.am 2007-04-11 17:13:43 UTC (rev 312)
@@ -42,7 +42,6 @@
my_blob \
my_bulk \
my_catalog \
-my_col_length \
my_curext \
my_cursor \
my_datetime \
Deleted: trunk/test/my_col_length.c
===================================================================
--- trunk/test/my_col_length.c 2007-04-10 23:09:14 UTC (rev 311)
+++ trunk/test/my_col_length.c 2007-04-11 17:13:43 UTC (rev 312)
@@ -1,194 +0,0 @@
-/*
- Copyright (C) 1997-2007 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License as
- published by the Free Software Foundation.
-
- There are special exceptions to the terms and conditions of the GPL
- as it is applied to this software. View the full text of the exception
- in file LICENSE.exceptions in the top-level directory of this software
- distribution.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "odbctap.h"
-
-/* TESTING FOR TRUE LENGTH */
-DECLARE_TEST(t_true_length)
-{
- SQLRETURN rc;
- SQLHDBC hdbc1;
- SQLHSTMT hstmt1;
- char conn[256];
- char data1[25],data2[25];
- SQLINTEGER len1,len2,desc_len;
-
- rc = SQLAllocConnect(henv,&hdbc1);
- myenv(henv,rc);
-
- sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd);
- if (mysock != NULL)
- {
- strcat(conn, ";SOCKET=");
- strcat(conn, mysock);
- }
- rc = SQLDriverConnect(hdbc1,NULL,conn,sizeof(conn),NULL,0,NULL,SQL_DRIVER_NOPROMPT);
- mycon(hdbc1,rc);
-
- rc = SQLAllocStmt(hdbc1,&hstmt1);
- mycon(hdbc1,rc);
- rc = SQLExecDirect(hstmt1,"CREATE DATABASE IF NOT EXISTS client_odbc_test",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"use client_odbc_test",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"DROP TABLE IF EXISTS t_true_length",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"create table t_true_length(col1 char(20),col2
varchar(15))",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"insert into t_true_length
values('venu','mysql')",SQL_NTS);
- mystmt(hstmt1,rc);
-
- SQLFreeStmt(hstmt1,SQL_CLOSE);
-
- rc = SQLEndTran(SQL_HANDLE_DBC,hdbc1,SQL_COMMIT);
- mycon(hdbc1,rc);
-
- rc = SQLExecDirect(hstmt1,"select * from t_true_length",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLDescribeCol(hstmt1,1,NULL,40,NULL,NULL,&desc_len,NULL,NULL);
- mystmt(hstmt1,rc);
- printMessage("desc-col1-length:%d\n",desc_len);
-
- rc = SQLDescribeCol(hstmt1,2,NULL,40,NULL,NULL,&desc_len,NULL,NULL);
- mystmt(hstmt1,rc);
- printMessage("desc-col2-length:%d\n",desc_len);
-
- rc = SQLFetch(hstmt1);
- mystmt(hstmt1,rc);
-
- rc = SQLGetData(hstmt1,1,SQL_C_CHAR,&data1,20,&len1);
- mystmt(hstmt1,rc);
- printMessage("fetch-col1:%s(%d)\n",data1,len1);
-
- rc = SQLGetData(hstmt1,2,SQL_C_CHAR,&data2,20,&len2);
- mystmt(hstmt1,rc);
- printMessage("fetch-col2:%s(%d)\n",data2,len2);
-
- rc = SQLFetch(hstmt1);
- mystmt_err(hstmt1,rc == SQL_NO_DATA_FOUND, rc);
-
- SQLFreeStmt(hstmt1,SQL_UNBIND);
- SQLFreeStmt(hstmt1,SQL_CLOSE);
-
- rc = SQLDisconnect(hdbc1);
- mycon(hdbc1,rc);
-
- rc = SQLFreeConnect(hdbc1);
- mycon(hdbc1,rc);
-}
-
-
-/* TESTING FOR MAX LENGTH */
-DECLARE_TEST(t_max_length)
-{
- SQLRETURN rc;
- SQLHDBC hdbc1;
- SQLHSTMT hstmt1;
- SQLCHAR data1[25],data2[25];
- SQLULEN desc_len;
- SQLINTEGER len1,len2;
- SQLCHAR conn[256];
-
- rc = SQLAllocConnect(henv,&hdbc1);
- myenv(henv,rc);
-
- sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=1",mydsn,myuid,mypwd);
- if (mysock != NULL)
- {
- strcat(conn, ";SOCKET=");
- strcat(conn, mysock);
- }
- rc = SQLDriverConnect(hdbc1,NULL,conn,sizeof(conn),NULL,0,NULL,SQL_DRIVER_NOPROMPT);
- mycon(hdbc1,rc);
-
- rc = SQLAllocStmt(hdbc1,&hstmt1);
- mycon(hdbc1,rc);
- sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd);
-
- rc = SQLExecDirect(hstmt1,"CREATE DATABASE IF NOT EXISTS client_odbc_test",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"use client_odbc_test",SQL_NTS);
- mystmt(hstmt1,rc);
-
- SQLExecDirect(hstmt1,"drop table t_max_length",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"create table t_max_length(col1 char(20),col2
varchar(15))",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLExecDirect(hstmt1,"insert into t_max_length values('venu','mysql')",SQL_NTS);
- mystmt(hstmt1,rc);
-
- SQLFreeStmt(hstmt1,SQL_CLOSE);
-
- rc = SQLEndTran(SQL_HANDLE_DBC,hdbc1,SQL_COMMIT);
- mycon(hdbc1,rc);
-
- rc = SQLExecDirect(hstmt1,"select * from t_max_length",SQL_NTS);
- mystmt(hstmt1,rc);
-
- rc = SQLDescribeCol(hstmt1,1,NULL,40,NULL,NULL,&desc_len,NULL,NULL);
- mystmt(hstmt1,rc);
- printMessage("desc-col1-length:%d\n",desc_len);
-
- rc = SQLDescribeCol(hstmt1,2,NULL,40,NULL,NULL,&desc_len,NULL,NULL);
- mystmt(hstmt1,rc);
- printMessage("desc-col2-length:%d\n",desc_len);
-
- rc = SQLFetch(hstmt1);
- mystmt(hstmt1,rc);
-
- rc = SQLGetData(hstmt1,1,SQL_C_CHAR,&data1,20,&len1);
- mystmt(hstmt1,rc);
- printMessage("fetch-col1:%s(%d)\n",data1,len1);
-
- rc = SQLGetData(hstmt1,2,SQL_C_CHAR,&data2,20,&len2);
- mystmt(hstmt1,rc);
- printMessage("fetch-col2:%s(%d)\n",data2,len2);
-
- rc = SQLFetch(hstmt1);
- mystmt_err(hstmt1,rc == SQL_NO_DATA_FOUND, rc);
-
- SQLFreeStmt(hstmt1,SQL_UNBIND);
- SQLFreeStmt(hstmt1,SQL_CLOSE);
-
- rc = SQLDisconnect(hdbc1);
- mycon(hdbc1,rc);
-
- rc = SQLFreeConnect(hdbc1);
- mycon(hdbc1,rc);
-}
-
-
-BEGIN_TESTS
- ADD_TEST(t_true_length)
- ADD_TEST(t_max_length)
-END_TESTS
-
-
-RUN_TESTS
Modified: trunk/test/my_result.c
===================================================================
--- trunk/test/my_result.c 2007-04-10 23:09:14 UTC (rev 311)
+++ trunk/test/my_result.c 2007-04-11 17:13:43 UTC (rev 312)
@@ -1672,6 +1672,52 @@
}
+/* TESTING FOR TRUE LENGTH */
+DECLARE_TEST(t_true_length)
+{
+ SQLCHAR data1[25],data2[25];
+ SQLLEN len1,len2;
+ SQLULEN desc_len;
+
+ ok_sql(hstmt, "DROP TABLE IF EXISTS t_true_length");
+ ok_sql(hstmt, "CREATE TABLE t_true_length (a CHAR(20), b VARCHAR(15))");
+ ok_sql(hstmt, "INSERT INTO t_true_length VALUES ('venu','mysql')");
+
+ ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));
+
+ ok_sql(hstmt, "SELECT * FROM t_true_length");
+
+ ok_stmt(hstmt, SQLDescribeCol(hstmt, 1, NULL, 0, NULL, NULL,
+ &desc_len, NULL, NULL));
+ is_num(desc_len, 20);
+
+ ok_stmt(hstmt, SQLDescribeCol(hstmt, 2, NULL, 0, NULL, NULL,
+ &desc_len, NULL, NULL));
+ is_num(desc_len, 15);
+
+ ok_stmt(hstmt, SQLFetch(hstmt));
+
+ ok_stmt(hstmt, SQLGetData(hstmt, 1, SQL_C_CHAR, data1, sizeof(data1),
+ &len1));
+ is_str(data1, "venu", 4);
+ is_num(len1, 4);
+
+ ok_stmt(hstmt, SQLGetData(hstmt, 2, SQL_C_CHAR, data2, sizeof(data2),
+ &len2));
+ is_str(data2, "mysql", 5);
+ is_num(len2, 5);
+
+ expect_stmt(hstmt, SQLFetch(hstmt), SQL_NO_DATA_FOUND);
+
+ ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_UNBIND));
+ ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));
+
+ ok_sql(hstmt, "DROP TABLE IF EXISTS t_true_length");
+
+ return OK;
+}
+
+
BEGIN_TESTS
ADD_TEST(my_resultset)
ADD_TEST(t_convert_type)
@@ -1689,6 +1735,7 @@
ADD_TEST(t_colattributes)
ADD_TEST(t_exfetch)
ADD_TEST(tmysql_rowstatus)
+ ADD_TEST(t_true_length)
END_TESTS
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r312 - trunk/test | jwinstead | 11 Apr |
