Skip to content

Add BCP truncation surveys and logistical support for them. #598

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

Open
ucko wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add BCP truncation surveys and logistical support for them. #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e91f1c
Let ctlib and dblib unit tests work better with Sybase libraries
ucko Jul 3, 2024
b45838c
Add ctlib and dblib "tests" that summarize BCP truncation semantics.
ucko Jul 3, 2024
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
2 changes: 1 addition & 1 deletion include/sqldb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef SQLDB_h
#define SQLDB_h

#include "./sybdb.h"
#include <sybdb.h>

#define SQLCHAR SYBCHAR
#define SQLVARCHAR SYBVARCHAR
Expand Down
5 changes: 3 additions & 2 deletions include/sqlfront.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
#ifndef SQLFRONT_h
#define SQLFRONT_h

#include "./sybfront.h"
#include <sybfront.h>
#include <sybdb.h>

static const char rcsid_sqlfront_h[] = "$Id: sqlfront.h,v 1.10 2011-07-13 11:06:31 freddy77 Exp $";
static const void *const no_unused_sqlfront_h_warn[] = { rcsid_sqlfront_h, no_unused_sqlfront_h_warn };
Expand All @@ -43,7 +44,7 @@ typedef const LPINT LPCINT;
#define _LPCBYTE_DEFINED
typedef const BYTE * LPCBYTE;
#endif
typedef USHORT * LPUSHORT;
typedef unsigned short * LPUSHORT;
typedef const LPUSHORT LPCUSHORT;
typedef DBINT * LPDBINT;
typedef const LPDBINT LPCDBINT;
Expand Down
2 changes: 1 addition & 1 deletion src/ctlib/unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ foreach(target t0001 t0002 t0003 t0004
ct_diagclient ct_diagserver ct_diagall
cs_config cancel blk_in
blk_out ct_cursor ct_cursors
ct_dynamic blk_in2 datafmt data
ct_dynamic blk_in2 blk_in3 datafmt data
all_types long_binary will_convert
variant errors ct_command)
add_executable(c_${target} EXCLUDE_FROM_ALL ${target}.c)
Expand Down
2 changes: 2 additions & 0 deletions src/ctlib/unittests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ TESTS = \
ct_cursors$(EXEEXT) \
ct_dynamic$(EXEEXT) \
blk_in2$(EXEEXT) \
blk_in3$(EXEEXT) \
datafmt$(EXEEXT) \
data$(EXEEXT) \
rpc_fail$(EXEEXT) \
Expand Down Expand Up @@ -70,6 +71,7 @@ ct_cursor_SOURCES = ct_cursor.c
ct_cursors_SOURCES = ct_cursors.c
ct_dynamic_SOURCES = ct_dynamic.c
blk_in2_SOURCES = blk_in2.c
blk_in3_SOURCES = blk_in3.c
datafmt_SOURCES = datafmt.c
data_SOURCES = data.c
rpc_fail_SOURCES = rpc_fail.c
Expand Down
2 changes: 1 addition & 1 deletion src/ctlib/unittests/all_types.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ main(void)

tdsdump_open(tds_dir_getenv(TDS_DIR("TDSDUMP")));

check_call(cs_ctx_alloc, (CS_VERSION_100, &ctx));
check_call(cs_ctx_alloc, (UT_CS_VERSION, &ctx));

tds_ctx = tds_alloc_context(NULL);
assert(tds_ctx);
Expand Down
2 changes: 1 addition & 1 deletion src/ctlib/unittests/blk_in.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ main(void)

check_call(run_command, (cmd, create_table_sql));

check_call(blk_alloc, (conn, BLK_VERSION_100, &blkdesc));
check_call(blk_alloc, (conn, UT_BLK_VERSION, &blkdesc));

check_call(blk_init, (blkdesc, CS_BLK_IN, (char *) table_name, CS_NULLTERM));

Expand Down
2 changes: 1 addition & 1 deletion src/ctlib/unittests/blk_in2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ main(void)

check_call(run_command, (cmd, create_table_sql));

check_call(blk_alloc, (conn, BLK_VERSION_100, &blkdesc));
check_call(blk_alloc, (conn, UT_BLK_VERSION, &blkdesc));

for (i = 0; i < 10; i++) {
/* compute some data */
Expand Down
Loading