Skip to content

Parameterized execution #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 19, 2018
Merged

Parameterized execution #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1401503
no support for params arrays or statement batching
bpintea Jun 26, 2018
f4e9aab
small fix: indicate catalog support
bpintea Jun 26, 2018
a7ec890
b/f: fix c&p error
bpintea Jun 26, 2018
0a45965
Merge branch 'feature/string_conversions' into feature/parameterized_…
bpintea Jun 27, 2018
32e78f2
added parameter binding implementation
bpintea Jul 1, 2018
6713892
add c2sql boolean conversion; various fixes
bpintea Jul 4, 2018
e295e5d
add parameter conversions to SQL numeric types
bpintea Jul 8, 2018
1880312
added param conversions to (ES) DATE (SQL TIMESTAMP)
bpintea Jul 9, 2018
92d8d10
add param conversion for varchar
bpintea Jul 10, 2018
6fe2865
coding style improvements
bpintea Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ endif (${CMD_RETURN})

# Set compiler flags and options.
if (${WIN32})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
# set the Visual Studio warning level to 4
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
Expand Down
15 changes: 7 additions & 8 deletions driver/catalogue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "catalogue.h"
#include "log.h"
#include "handles.h"
#include "connect.h"
#include "info.h"
#include "queries.h"

Expand Down Expand Up @@ -64,7 +63,7 @@ SQLSMALLINT copy_current_catalog(esodbc_dbc_st *dbc, SQLWCHAR *dest,
ERRH(dbc, "failed to attach query to statement.");
goto end;
}
if (! SQL_SUCCEEDED(post_statement(stmt))) {
if (! SQL_SUCCEEDED(EsSQLExecute(stmt))) {
ERRH(dbc, "failed to post query.");
goto end;
}
Expand Down Expand Up @@ -198,7 +197,7 @@ SQLRETURN EsSQLTablesW(
pos = sizeof(SQL_TABLES) - 1;
wmemcpy(wbuf, MK_WPTR(SQL_TABLES), pos);

if (CatalogName) {
if (CatalogName && NameLength1) {
catalog = CatalogName;
if (NameLength1 == SQL_NTS) {
cnt_cat = wcslen(catalog);
Expand All @@ -222,7 +221,7 @@ SQLRETURN EsSQLTablesW(
}
}

if (SchemaName) {
if (SchemaName && NameLength2) {
schema = SchemaName;
if (NameLength2 == SQL_NTS) {
cnt_sch = wcslen(schema);
Expand All @@ -245,7 +244,7 @@ SQLRETURN EsSQLTablesW(
}

// FIXME: string needs escaping of % \\ _
if (TableName) {
if (TableName && NameLength3) {
table = TableName;
if (NameLength3 == SQL_NTS) {
cnt_tab = wcslen(table);
Expand All @@ -269,7 +268,7 @@ SQLRETURN EsSQLTablesW(
}
}

if (TableType) {
if (TableType && NameLength4) {
type = TableType;
if (NameLength4 == SQL_NTS) {
cnt_typ = wcslen(type);
Expand Down Expand Up @@ -306,7 +305,7 @@ SQLRETURN EsSQLTablesW(
assert(SQL_SUCCEEDED(ret)); /* can't return error */
ret = attach_sql(stmt, wbuf, pos);
if (SQL_SUCCEEDED(ret)) {
ret = post_statement(stmt);
ret = EsSQLExecute(stmt);
}
return ret;
}
Expand Down Expand Up @@ -435,7 +434,7 @@ SQLRETURN EsSQLColumnsW
assert(SQL_SUCCEEDED(ret)); /* can't return error */
ret = attach_sql(stmt, wbuf, pos);
if (SQL_SUCCEEDED(ret)) {
ret = post_statement(stmt);
ret = EsSQLExecute(stmt);
}
return ret;
}
Expand Down
Loading