mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
psqlodbc: upgrade 17.00.0006 -> 17.00.0007
add-expected-output-file-for-descrec-test.patch
removed since it's included in 17.00.0007
psqlodbc-fix-for-ptest-support.patch
refreshed for 17.00.0007
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 967e5c9e0f)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
This commit is contained in:
@@ -1,72 +0,0 @@
|
|||||||
From 453a8bdcaafde9fcd108a195ffea3ccb5c4d0a21 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christoph Berg <myon@debian.org>
|
|
||||||
Date: Mon, 16 Jun 2025 20:25:26 +0200
|
|
||||||
Subject: [PATCH] Add expected output file for descrec test in C locale (#131)
|
|
||||||
|
|
||||||
When running with LC_ALL=C, SQL_DESC_OCTET_LENGTH matches the character
|
|
||||||
length. Add "10" as accepted value.
|
|
||||||
|
|
||||||
The net diff to the existing descrec.out file is this:
|
|
||||||
|
|
||||||
test/expected/descrec.out 2025-06-13 19:02:36.460302799 +0200
|
|
||||||
test/expected/descrec_2.out 2025-06-16 14:34:44.270543393 +0200
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
-- Column 3 --
|
|
||||||
SQL_DESC_NAME: col3
|
|
||||||
SQL_DESC_TYPE: 12
|
|
||||||
-SQL_DESC_OCTET_LENGTH: 40
|
|
||||||
+SQL_DESC_OCTET_LENGTH: 10
|
|
||||||
SQL_DESC_PRECISION: 0
|
|
||||||
SQL_DESC_SCALE: 0
|
|
||||||
SQL_DESC_NULLABLE: 0
|
|
||||||
|
|
||||||
Fixes #51.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/postgresql-interfaces/psqlodbc/commit/453a8bdcaafde9fcd108a195ffea3ccb5c4d0a21]
|
|
||||||
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
test/expected/descrec_2.out | 34 ++++++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 34 insertions(+)
|
|
||||||
create mode 100644 test/expected/descrec_2.out
|
|
||||||
|
|
||||||
diff --git a/test/expected/descrec_2.out b/test/expected/descrec_2.out
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..6f61c49
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/test/expected/descrec_2.out
|
|
||||||
@@ -0,0 +1,34 @@
|
|
||||||
+connected
|
|
||||||
+
|
|
||||||
+-- Column 1 --
|
|
||||||
+SQL_DESC_NAME: col1
|
|
||||||
+SQL_DESC_TYPE: 4
|
|
||||||
+SQL_DESC_OCTET_LENGTH: 0
|
|
||||||
+SQL_DESC_PRECISION: 0
|
|
||||||
+SQL_DESC_SCALE: 0
|
|
||||||
+SQL_DESC_NULLABLE: 0
|
|
||||||
+
|
|
||||||
+-- Column 2 --
|
|
||||||
+SQL_DESC_NAME: col2
|
|
||||||
+SQL_DESC_TYPE: 2
|
|
||||||
+SQL_DESC_OCTET_LENGTH: 6
|
|
||||||
+SQL_DESC_PRECISION: 4
|
|
||||||
+SQL_DESC_SCALE: 2
|
|
||||||
+SQL_DESC_NULLABLE: 1
|
|
||||||
+
|
|
||||||
+-- Column 3 --
|
|
||||||
+SQL_DESC_NAME: col3
|
|
||||||
+SQL_DESC_TYPE: 12
|
|
||||||
+SQL_DESC_OCTET_LENGTH: 10
|
|
||||||
+SQL_DESC_PRECISION: 0
|
|
||||||
+SQL_DESC_SCALE: 0
|
|
||||||
+SQL_DESC_NULLABLE: 0
|
|
||||||
+
|
|
||||||
+-- Column 4 --
|
|
||||||
+SQL_DESC_NAME: col4
|
|
||||||
+SQL_DESC_TYPE: -5
|
|
||||||
+SQL_DESC_OCTET_LENGTH: 8
|
|
||||||
+SQL_DESC_PRECISION: 0
|
|
||||||
+SQL_DESC_SCALE: 0
|
|
||||||
+SQL_DESC_NULLABLE: 0
|
|
||||||
+disconnecting
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
From 96896b88776d0080609ec830cf9538d2babe665a Mon Sep 17 00:00:00 2001
|
From b0175d6124ae0460fbeaf34c964aff587fa978c2 Mon Sep 17 00:00:00 2001
|
||||||
From: Jackie Huang <jackie.huang@windriver.com>
|
From: Jackie Huang <jackie.huang@windriver.com>
|
||||||
Date: Tue, 5 Sep 2017 10:24:10 +0800
|
Date: Tue, 5 Sep 2017 10:24:10 +0800
|
||||||
Subject: [PATCH] psqlodbc: fixes for ptest support
|
Subject: [PATCH] psqlodbc: fixes for ptest support
|
||||||
@@ -12,13 +12,14 @@ Subject: [PATCH] psqlodbc: fixes for ptest support
|
|||||||
Upstream-Status: Inappropriate [OE ptest specific]
|
Upstream-Status: Inappropriate [OE ptest specific]
|
||||||
|
|
||||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
test/Makefile.in | 2 +-
|
test/Makefile.in | 2 +-
|
||||||
test/odbcini-gen.sh | 8 ++++----
|
test/odbcini-gen.sh | 10 +++++-----
|
||||||
test/runsuite.c | 20 ++++++++++----------
|
test/runsuite.c | 20 ++++++++++----------
|
||||||
3 files changed, 15 insertions(+), 15 deletions(-)
|
3 files changed, 16 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/Makefile.in b/test/Makefile.in
|
||||||
|
index 3f9a9af..09406ae 100644
|
||||||
--- a/test/Makefile.in
|
--- a/test/Makefile.in
|
||||||
+++ b/test/Makefile.in
|
+++ b/test/Makefile.in
|
||||||
@@ -19,7 +19,7 @@ CPPFLAGS = @CPPFLAGS@ -I.. # config.h
|
@@ -19,7 +19,7 @@ CPPFLAGS = @CPPFLAGS@ -I.. # config.h
|
||||||
@@ -30,6 +31,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||||||
|
|
||||||
all: $(TESTBINS) runsuite reset-db
|
all: $(TESTBINS) runsuite reset-db
|
||||||
|
|
||||||
|
diff --git a/test/odbcini-gen.sh b/test/odbcini-gen.sh
|
||||||
|
index 2eaba35..d7c03ba 100755
|
||||||
--- a/test/odbcini-gen.sh
|
--- a/test/odbcini-gen.sh
|
||||||
+++ b/test/odbcini-gen.sh
|
+++ b/test/odbcini-gen.sh
|
||||||
@@ -6,7 +6,7 @@
|
@@ -6,7 +6,7 @@
|
||||||
@@ -64,6 +67,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||||||
ReadOnly = No
|
ReadOnly = No
|
||||||
RowVersioning = No
|
RowVersioning = No
|
||||||
ShowSystemTables = No
|
ShowSystemTables = No
|
||||||
|
diff --git a/test/runsuite.c b/test/runsuite.c
|
||||||
|
index 6ac3709..023ac1d 100644
|
||||||
--- a/test/runsuite.c
|
--- a/test/runsuite.c
|
||||||
+++ b/test/runsuite.c
|
+++ b/test/runsuite.c
|
||||||
@@ -55,7 +55,7 @@ bailout(const char *fmt, ...)
|
@@ -55,7 +55,7 @@ bailout(const char *fmt, ...)
|
||||||
@@ -75,7 +80,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||||||
{
|
{
|
||||||
const char *basename;
|
const char *basename;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@@ -69,7 +69,7 @@ parse_argument(const char *in, char *tes
|
@@ -69,7 +69,7 @@ parse_argument(const char *in, char *testname, char *binname)
|
||||||
if (strchr(in, DIR_SEP) == NULL)
|
if (strchr(in, DIR_SEP) == NULL)
|
||||||
{
|
{
|
||||||
strcpy(testname, in);
|
strcpy(testname, in);
|
||||||
@@ -93,7 +98,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||||||
if (runtest(binname, testname, i, inputdir) != 0)
|
if (runtest(binname, testname, i, inputdir) != 0)
|
||||||
failures++;
|
failures++;
|
||||||
}
|
}
|
||||||
@@ -161,29 +161,29 @@ runtest(const char *binname, const char
|
@@ -161,29 +161,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
snprintf(cmdline, sizeof(cmdline),
|
snprintf(cmdline, sizeof(cmdline),
|
||||||
"ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini "
|
"ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini "
|
||||||
|
|||||||
+6
-7
@@ -20,14 +20,13 @@ LICENSE = "LGPL-2.0-only"
|
|||||||
LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
|
LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/postgresql-interfaces/psqlodbc.git;protocol=https;branch=main;tag=REL-${PV_WITH_USCORE} \
|
SRC_URI = "git://github.com/postgresql-interfaces/psqlodbc.git;protocol=https;branch=main;tag=REL-${PV_WITH_USCORE} \
|
||||||
file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
|
file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
|
||||||
file://psqlodbc-donot-use-the-hardcode-libdir.patch \
|
file://psqlodbc-donot-use-the-hardcode-libdir.patch \
|
||||||
file://psqlodbc-fix-for-ptest-support.patch \
|
file://psqlodbc-fix-for-ptest-support.patch \
|
||||||
file://add-expected-output-file-for-descrec-test.patch \
|
file://run-ptest \
|
||||||
file://run-ptest \
|
"
|
||||||
"
|
|
||||||
|
|
||||||
SRCREV = "251c8e8200c7a030fa46e59429d3fec7a73de4ec"
|
SRCREV = "8038cee43d6dff468320008ea928f3eaa1186726"
|
||||||
PV_WITH_USCORE = "${@d.getVar('PV').replace('.', '_')}"
|
PV_WITH_USCORE = "${@d.getVar('PV').replace('.', '_')}"
|
||||||
|
|
||||||
DEPENDS += "postgresql unixodbc"
|
DEPENDS += "postgresql unixodbc"
|
||||||
Reference in New Issue
Block a user