Attachment #37057 for bug #14010




#define USE_OLD_FUNCTIONS
#include "tcl.h"
#include "sql-mysql.h"


// -------------------------------------------------------------
char *
Sql_mysql::getErrorMsg() {
	char *msg = (char *)mysql_error(&mysql);
	if (*msg == '\0') {
		return errormsg;
	} else {


// -------------------------------------------------------------
int
Sql_mysql::numRows(int resHandle) {
	if (!results[resHandle]) { return -1; }
	return(mysql_num_rows(results[resHandle]));
}


// -------------------------------------------------------------
void
Sql_mysql::endquery(int resHandle) {
	if (!results[resHandle]) return;
	mysql_free_result(results[resHandle]);
	results[resHandle] = NULL;

// Note: A new Sql_row is allocated. Has to be freed by calling
// party.
Sql_row *
Sql_mysql::fetchrow(int resHandle) {

	if (!results[resHandle]) {
		sprintf(errormsg, "Result handle [%d] not in use.\n", resHandle);





// -------------------------------------------------------------
//
int SqlCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) 
{
	if (argc == 1) {
		Tcl_SetResult(interp, "Usage: sql command ?handle?", TCL_STATIC);


	// -----------------------------------
	if (strcmp(argv[1], "connect")==0) {
		c = mgr->connect(argc-2, (char **)(argv+2));
		if (c < 0) {
			char *basemsg = "Unable to Connect: ";
			char *errmsg = mgr->getErrorMsg();

		if (argc <= 2) {
			Tcl_SetResult(interp, "Usage:\nsql command handle", TCL_STATIC);
			return TCL_ERROR;
		} else if ((connid = stripPrefix((char *)argv[2], HANDLE_PREFIX)) < 0) {
			Tcl_AppendResult(interp, "sql: Invalid handle: ", argv[2], NULL);
			return TCL_ERROR;
		} else if (!mgr->inUse(connid)) {


		// take care of the command:
		if (strcmp(argv[1], "exec") == 0) {
			res = execCmd(interp, conn, (char *)argv[3]);
		} else if (strcmp(argv[1], "query") == 0) {
			res = queryCmd(interp, conn, (char *)argv[3]);
		} else if (strcmp(argv[1], "endquery") == 0) {
			res = endqueryCmd(interp, conn, (char *)argv[3]);
		} else if (strcmp(argv[1], "fetchrow") == 0) {
			res = fetchrowCmd(interp, conn, (char *)argv[3]);
		} else if (strcmp(argv[1], "numrows") == 0) {
			res = numrowsCmd(interp, conn, (char *)argv[3]);
		} else if (strcmp(argv[1], "disconnect") == 0) {
			res = disconnectCmd(interp, mgr, connid);
		} else if (strcmp(argv[1], "selectdb")==0) {
			res = selectdbCmd(interp, conn, (char *)argv[3]);
		} else {
			Tcl_AppendResult(interp, "sql: unknown sql command: ", argv[1], NULL);
			return TCL_ERROR;

Return to bug 14010

Lines 1-3 Link Here

(-)tcl-sql.old/sql-mysql.cc (-4 / +5 lines)
		1	#define USE_OLD_FUNCTIONS
1	#include "tcl.h"	2	#include "tcl.h"
2	#include "sql-mysql.h"	3	#include "sql-mysql.h"
3		4
Lines 20-26 Link Here
20	// -------------------------------------------------------------	21	// -------------------------------------------------------------
21	char *	22	char *
22	Sql_mysql::getErrorMsg() {	23	Sql_mysql::getErrorMsg() {
23	char *msg = mysql_error(&mysql);	24	char msg = (char )mysql_error(&mysql);
24	if (*msg == '\0') {	25	if (*msg == '\0') {
25	return errormsg;	26	return errormsg;
26	} else {	27	} else {
Lines 71-77 Link Here
71		72
72	// -------------------------------------------------------------	73	// -------------------------------------------------------------
73	int	74	int
74	Sql_mysql::numRows(int resHandle=0) {	75	Sql_mysql::numRows(int resHandle) {
75	if (!results[resHandle]) { return -1; }	76	if (!results[resHandle]) { return -1; }
76	return(mysql_num_rows(results[resHandle]));	77	return(mysql_num_rows(results[resHandle]));
77	}	78	}
Lines 109-115 Link Here
109		110
110	// -------------------------------------------------------------	111	// -------------------------------------------------------------
111	void	112	void
112	Sql_mysql::endquery(int resHandle=0) {	113	Sql_mysql::endquery(int resHandle) {
113	if (!results[resHandle]) return;	114	if (!results[resHandle]) return;
114	mysql_free_result(results[resHandle]);	115	mysql_free_result(results[resHandle]);
115	results[resHandle] = NULL;	116	results[resHandle] = NULL;
Lines 120-126 Link Here
120	// Note: A new Sql_row is allocated. Has to be freed by calling	121	// Note: A new Sql_row is allocated. Has to be freed by calling
121	// party.	122	// party.
122	Sql_row *	123	Sql_row *
123	Sql_mysql::fetchrow(int resHandle=0) {	124	Sql_mysql::fetchrow(int resHandle) {
124		125
125	if (!results[resHandle]) {	126	if (!results[resHandle]) {
126	sprintf(errormsg, "Result handle [%d] not in use.\n", resHandle);	127	sprintf(errormsg, "Result handle [%d] not in use.\n", resHandle);

Lines 122-128 Link Here

(-)tcl-sql.old/sql.cc (-9 / +9 lines)
122		122
123	// -------------------------------------------------------------	123	// -------------------------------------------------------------
124	//	124	//
125	int SqlCmd(ClientData clientData, Tcl_Interp interp, int argc, char *argv)	125	int SqlCmd(ClientData clientData, Tcl_Interp interp, int argc, const char *argv)
126	{	126	{
127	if (argc == 1) {	127	if (argc == 1) {
128	Tcl_SetResult(interp, "Usage: sql command ?handle?", TCL_STATIC);	128	Tcl_SetResult(interp, "Usage: sql command ?handle?", TCL_STATIC);
Lines 137-143 Link Here
137		137
138	// -----------------------------------	138	// -----------------------------------
139	if (strcmp(argv[1], "connect")==0) {	139	if (strcmp(argv[1], "connect")==0) {
140	c = mgr->connect(argc-2, argv+2);	140	c = mgr->connect(argc-2, (char **)(argv+2));
141	if (c < 0) {	141	if (c < 0) {
142	char *basemsg = "Unable to Connect: ";	142	char *basemsg = "Unable to Connect: ";
143	char *errmsg = mgr->getErrorMsg();	143	char *errmsg = mgr->getErrorMsg();
Lines 160-166 Link Here
160	if (argc <= 2) {	160	if (argc <= 2) {
161	Tcl_SetResult(interp, "Usage:\nsql command handle", TCL_STATIC);	161	Tcl_SetResult(interp, "Usage:\nsql command handle", TCL_STATIC);
162	return TCL_ERROR;	162	return TCL_ERROR;
163	} else if ((connid = stripPrefix(argv[2], HANDLE_PREFIX)) < 0) {	163	} else if ((connid = stripPrefix((char *)argv[2], HANDLE_PREFIX)) < 0) {
164	Tcl_AppendResult(interp, "sql: Invalid handle: ", argv[2], NULL);	164	Tcl_AppendResult(interp, "sql: Invalid handle: ", argv[2], NULL);
165	return TCL_ERROR;	165	return TCL_ERROR;
166	} else if (!mgr->inUse(connid)) {	166	} else if (!mgr->inUse(connid)) {
Lines 172-190 Link Here
172		172
173	// take care of the command:	173	// take care of the command:
174	if (strcmp(argv[1], "exec") == 0) {	174	if (strcmp(argv[1], "exec") == 0) {
175	res = execCmd(interp, conn, argv[3]);	175	res = execCmd(interp, conn, (char *)argv[3]);
176	} else if (strcmp(argv[1], "query") == 0) {	176	} else if (strcmp(argv[1], "query") == 0) {
177	res = queryCmd(interp, conn, argv[3]);	177	res = queryCmd(interp, conn, (char *)argv[3]);
178	} else if (strcmp(argv[1], "endquery") == 0) {	178	} else if (strcmp(argv[1], "endquery") == 0) {
179	res = endqueryCmd(interp, conn, argv[3]);	179	res = endqueryCmd(interp, conn, (char *)argv[3]);
180	} else if (strcmp(argv[1], "fetchrow") == 0) {	180	} else if (strcmp(argv[1], "fetchrow") == 0) {
181	res = fetchrowCmd(interp, conn, argv[3]);	181	res = fetchrowCmd(interp, conn, (char *)argv[3]);
182	} else if (strcmp(argv[1], "numrows") == 0) {	182	} else if (strcmp(argv[1], "numrows") == 0) {
183	res = numrowsCmd(interp, conn, argv[3]);	183	res = numrowsCmd(interp, conn, (char *)argv[3]);
184	} else if (strcmp(argv[1], "disconnect") == 0) {	184	} else if (strcmp(argv[1], "disconnect") == 0) {
185	res = disconnectCmd(interp, mgr, connid);	185	res = disconnectCmd(interp, mgr, connid);
186	} else if (strcmp(argv[1], "selectdb")==0) {	186	} else if (strcmp(argv[1], "selectdb")==0) {
187	res = selectdbCmd(interp, conn, argv[3]);	187	res = selectdbCmd(interp, conn, (char *)argv[3]);
188	} else {	188	} else {
189	Tcl_AppendResult(interp, "sql: unknown sql command: ", argv[1], NULL);	189	Tcl_AppendResult(interp, "sql: unknown sql command: ", argv[1], NULL);
190	return TCL_ERROR;	190	return TCL_ERROR;