!44 [sync] PR-41: set default coltype for freebcp

From: @openeuler-sync-bot 
Reviewed-by: @starlet-dx 
Signed-off-by: @starlet-dx
This commit is contained in:
openeuler-ci-bot 2025-05-14 09:35:38 +00:00 committed by Gitee
commit 2c0c6d33bf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 6dfc261f3325e17e6a71b91a7af4eaa176ebe560 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Wed, 14 May 2025 14:27:30 +0800
Subject: [PATCH] set default coltype to CHAR
---
src/apps/freebcp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/apps/freebcp.c b/src/apps/freebcp.c
index f246ee5..564999d 100644
--- a/src/apps/freebcp.c
+++ b/src/apps/freebcp.c
@@ -618,7 +618,10 @@ file_native(BCPPARAMDATA * pdata, DBPROCESS * dbproc, DBINT dir)
for (i = 1; i <= li_numcols; i++) {
li_coltype = dbcoltype(dbproc, i);
-
+
+ if (li_coltype == -1)
+ li_coltype = SYBCHAR;
+
if (bcp_colfmt(dbproc, i, li_coltype, -1, -1, NULL, -1, i) == FAIL) {
fprintf(stderr, "Error in bcp_colfmt col %d\n", i);
return FALSE;
--
2.43.0

View File

@ -1,15 +1,17 @@
Name: freetds Name: freetds
Summary: Implementation of the TDS (Tabular DataStream) protocol Summary: Implementation of the TDS (Tabular DataStream) protocol
Version: 1.4.9 Version: 1.4.9
Release: 1 Release: 2
License: LGPLv2+ and GPLv2+ License: LGPLv2+ and GPLv2+
URL: http://www.freetds.org/ URL: http://www.freetds.org/
Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.gz Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.gz
Source1: freetds-tds_sysdep_public.h Source1: freetds-tds_sysdep_public.h
Patch0: 0001-set-default-coltype-to-CHAR.patch
BuildRequires: unixODBC-devel readline-devel gnutls-devel krb5-devel git BuildRequires: unixODBC-devel readline-devel gnutls-devel krb5-devel git
BuildRequires: libgcrypt-devel libtool doxygen docbook-style-dsssl gperf BuildRequires: libgcrypt-devel libtool doxygen docbook-style-dsssl gperf
BuildRequires: libtool-devel
Provides: %{name}-libs = %{version}-%{release} Provides: %{name}-libs = %{version}-%{release}
Obsoletes: %{name}-libs < %{version}-%{release} Obsoletes: %{name}-libs < %{version}-%{release}
@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed May 14 2025 Ge Wang <wang__ge@126.com> - 1.4.9-2
- Set default coltype for freebcp
* Tue Dec 05 2023 Ge Wang <wang__ge@126.com> - 1.4.9-1 * Tue Dec 05 2023 Ge Wang <wang__ge@126.com> - 1.4.9-1
- Update to version 1.4.9 - Update to version 1.4.9