hcq/openGauss-connector-odbc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!10 修改odbc测试代码bug以及重构相关代码

Browse Source 
Merge pull request !10 from 赵文浩/master
This commit is contained in:
opengauss-bot
2021-05-31 16:25:05 +08:00
committed by Gitee
parent 999ba8d913 255028fe1e
commit a8b0bc2bca
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
odbc-test-gauss/Makefile
View File

@ -25,6 +25,7 @@ ifndef cases
odbc_nvarchar2_10_manycol \ odbc_nvarchar2_10_manycol \
odbc_nvarchar2_11_out \ odbc_nvarchar2_11_out \
odbc_sha256 \ odbc_sha256 \
odbc_sm3 \
odbc_smalldatetime_01_SQLPrimaryKeys \ odbc_smalldatetime_01_SQLPrimaryKeys \
odbc_smalldatetime_02_SQLColumn \ odbc_smalldatetime_02_SQLColumn \
odbc_smalldatetime_03_SQLBindParameter \ odbc_smalldatetime_03_SQLBindParameter \
@ -79,14 +80,13 @@ ifndef cases
cvtnulldate-test \ cvtnulldate-test \
stmthandles-test \ stmthandles-test \
odbc_batch_insert \ odbc_batch_insert \
odbc_connection_info \
odbc_DTS2019070108437 \ odbc_DTS2019070108437 \
odbc_transaction_for_extension_connector \ odbc_transaction_for_extension_connector \
odbc_DTS2019071815351 odbc_DTS2019071815351
endif endif
all: $(cases) all:$(deps) $(cases)
%: %.c %: %.c
$(CC) -l odbc -O0 -g -o $@ $< $(deps) $(CC) -l odbc -O0 -g -o $@ $< $(deps)

2
odbc-test-gauss/dataatexecution-test.c
View File

@ -3,7 +3,7 @@
#include <string.h> #include <string.h>
#include "common.h" #include "common.h"
#define VOID void
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
SQLRETURN rc; SQLRETURN rc;

42
odbc-test-gauss/odbc_sm3.c
View File

@ -28,6 +28,21 @@ char *buf = "Mike";
char *buf1 = "haha"; char *buf1 = "haha";
int value = 3; int value = 3;
static inline void SM3SQLFreeHandle()
{
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt);
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
}
static inline void SM3SQLFreeHandleAndFreeConnect()
{
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt);
SQLDisconnect(V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
}
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
@ -95,9 +110,7 @@ int main(int argc,char *argv[])
printf("Error in drop %d\n",V_OD_erg); printf("Error in drop %d\n",V_OD_erg);
SQLGetDiagRec(SQL_HANDLE_DBC, V_OD_hdbc,1, V_OD_stat,&V_OD_err,V_OD_msg,100,&V_OD_mlen); SQLGetDiagRec(SQL_HANDLE_DBC, V_OD_hdbc,1, V_OD_stat,&V_OD_err,V_OD_msg,100,&V_OD_mlen);
printf("%s (%d)\n",V_OD_msg,V_OD_err); printf("%s (%d)\n",V_OD_msg,V_OD_err);
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt); SM3SQLFreeHandle();
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
return -1; return -1;
} }
@ -108,9 +121,7 @@ int main(int argc,char *argv[])
printf("Error in create %d\n",V_OD_erg); printf("Error in create %d\n",V_OD_erg);
SQLGetDiagRec(SQL_HANDLE_DBC, V_OD_hdbc,1, V_OD_stat,&V_OD_err,V_OD_msg,100,&V_OD_mlen); SQLGetDiagRec(SQL_HANDLE_DBC, V_OD_hdbc,1, V_OD_stat,&V_OD_err,V_OD_msg,100,&V_OD_mlen);
printf("%s (%d)\n",V_OD_msg,V_OD_err); printf("%s (%d)\n",V_OD_msg,V_OD_err);
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt); SM3SQLFreeHandle();
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
return -1; return -1;
} }
@ -123,9 +134,7 @@ int main(int argc,char *argv[])
printf("Error in Select %d\n",V_OD_erg); printf("Error in Select %d\n",V_OD_erg);
SQLGetDiagRec(SQL_HANDLE_DBC, V_OD_hdbc,1, V_OD_stat,&V_OD_err,V_OD_msg,100,&V_OD_mlen); SQLGetDiagRec(SQL_HANDLE_DBC, V_OD_hdbc,1, V_OD_stat,&V_OD_err,V_OD_msg,100,&V_OD_mlen);
printf("%s (%d)\n",V_OD_msg,V_OD_err); printf("%s (%d)\n",V_OD_msg,V_OD_err);
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt); SM3SQLFreeHandle();
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
return -1; return -1;
} }
@ -133,10 +142,7 @@ int main(int argc,char *argv[])
V_OD_erg=SQLNumResultCols(V_OD_hstmt,&V_OD_colanz); V_OD_erg=SQLNumResultCols(V_OD_hstmt,&V_OD_colanz);
if ((V_OD_erg != SQL_SUCCESS) && (V_OD_erg != SQL_SUCCESS_WITH_INFO)) if ((V_OD_erg != SQL_SUCCESS) && (V_OD_erg != SQL_SUCCESS_WITH_INFO))
{ {
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt); SM3SQLFreeHandleAndFreeConnect();
SQLDisconnect(V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
return -1; return -1;
} }
printf("SQLNumResultCols ---- Number of Columns %d\n",V_OD_colanz); printf("SQLNumResultCols ---- Number of Columns %d\n",V_OD_colanz);
@ -146,10 +152,7 @@ int main(int argc,char *argv[])
if ((V_OD_erg != SQL_SUCCESS) && (V_OD_erg != SQL_SUCCESS_WITH_INFO)) if ((V_OD_erg != SQL_SUCCESS) && (V_OD_erg != SQL_SUCCESS_WITH_INFO))
{ {
printf("Number of RowCount %d\n",V_OD_erg); printf("Number of RowCount %d\n",V_OD_erg);
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt); SM3SQLFreeHandleAndFreeConnect();
SQLDisconnect(V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
return -1; return -1;
} }
printf("SQLRowCount ----- Number of Rows %d\n",V_OD_rowanz); printf("SQLRowCount ----- Number of Rows %d\n",V_OD_rowanz);
@ -165,10 +168,7 @@ int main(int argc,char *argv[])
}; };
SQLFreeHandle(SQL_HANDLE_STMT,V_OD_hstmt); SM3SQLFreeHandleAndFreeConnect();
SQLDisconnect(V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_DBC,V_OD_hdbc);
SQLFreeHandle(SQL_HANDLE_ENV, V_OD_Env);
return(0); return(0);
} }