keplerproject/luasql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #137 from cazfi/odbc-warnings

Browse Source 
Odbc warnings
This commit is contained in:
Tomás Guisasola 2022-02-07 11:07:00 -03:00 committed by GitHub
commit 061e8afb62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ls_odbc.c
View File

@ -32,11 +32,11 @@
#define LUASQL_STATEMENT_ODBC "ODBC statement" #define LUASQL_STATEMENT_ODBC "ODBC statement"
#define LUASQL_CURSOR_ODBC "ODBC cursor" #define LUASQL_CURSOR_ODBC "ODBC cursor"
/* holds data for paramter binding */ /* holds data for parameter binding */
typedef struct { typedef struct {
SQLPOINTER buf; SQLPOINTER buf;
SQLINTEGER len; SQLLEN len;
SQLINTEGER type; SQLLEN type;
} param_data; } param_data;
/* general form of the driver objects */ /* general form of the driver objects */
@ -688,7 +688,7 @@ static int raw_execute(lua_State *L, int istmt)
return create_cursor(L, -1, stmt, numcols); return create_cursor(L, -1, stmt, numcols);
} else { } else {
/* if action has no results (e.g., UPDATE) */ /* if action has no results (e.g., UPDATE) */
SQLINTEGER numrows; SQLLEN numrows;
if(error(SQLRowCount(stmt->hstmt, &numrows))) { if(error(SQLRowCount(stmt->hstmt, &numrows))) {
return fail(L, hSTMT, stmt->hstmt); return fail(L, hSTMT, stmt->hstmt);
} }
@ -700,7 +700,7 @@ static int raw_execute(lua_State *L, int istmt)
static int set_param(lua_State *L, stmt_data *stmt, int i, param_data *data) static int set_param(lua_State *L, stmt_data *stmt, int i, param_data *data)
{ {
static SQLINTEGER cbNull = SQL_NULL_DATA; static SQLLEN cbNull = SQL_NULL_DATA;
switch(lua_type(L, -1)) { switch(lua_type(L, -1)) {
case LUA_TNIL: { case LUA_TNIL: {
@ -777,7 +777,6 @@ static int set_param(lua_State *L, stmt_data *stmt, int i, param_data *data)
*/ */
static int raw_readparams_table(lua_State *L, stmt_data *stmt, int iparams) static int raw_readparams_table(lua_State *L, stmt_data *stmt, int iparams)
{ {
static SQLINTEGER cbNull = SQL_NULL_DATA;
SQLSMALLINT i; SQLSMALLINT i;
param_data *data; param_data *data;
int res = 0; int res = 0;
@ -805,7 +804,6 @@ static int raw_readparams_table(lua_State *L, stmt_data *stmt, int iparams)
*/ */
static int raw_readparams_args(lua_State *L, stmt_data *stmt, int arg, int ltop) static int raw_readparams_args(lua_State *L, stmt_data *stmt, int arg, int ltop)
{ {
static SQLINTEGER cbNull = SQL_NULL_DATA;
SQLSMALLINT i; SQLSMALLINT i;
param_data *data; param_data *data;
int res = 0; int res = 0;
@ -1116,9 +1114,9 @@ static int env_close (lua_State *L)
env->closed = 1; env->closed = 1;
ret = SQLFreeHandle (hENV, env->henv); ret = SQLFreeHandle (hENV, env->henv);
if (error(ret)) { if (error(ret)) {
int ret = fail(L, hENV, env->henv); int ret2 = fail(L, hENV, env->henv);
env->henv = NULL; env->henv = NULL;
return ret; return ret2;
} }
return pass(L); return pass(L);
} }