| Message ID | 20251023144351.264756-1-skandigraun@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,1/2] psqlodbc: upgrade 16.00.0000 -> 17.00.0006 | expand |
After this patch there are still 2 more failing tests (they were present in the previous version also), and I'm kinda clueless at this moment... On 10/23/25 16:43, Gyorgy Sarvari via lists.openembedded.org wrote: > The descrec test fails currently, due to the different characterwidth > postgres uses depending on the current locale. > > If the locale is C or posix, then each character is 1 byte. Otherwise, > if it's some UTF8 locale, then it is 4 bytes. > > The test case expects 4 byte width by default, making it fail. This backported patch > allows for both 4 and 1 byte characters to be tested successfully. > > Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> > --- > ...xpected-output-file-for-descrec-test.patch | 72 +++++++++++++++++++ > .../psqlodbc/psqlodbc_17.00.0006.bb | 1 + > 2 files changed, 73 insertions(+) > create mode 100644 meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch > > diff --git a/meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch b/meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch > new file mode 100644 > index 0000000000..af25b207c8 > --- /dev/null > +++ b/meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch > @@ -0,0 +1,72 @@ > +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 > diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb > index cead6789f4..2fbd8b78e4 100644 > --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb > +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb > @@ -24,6 +24,7 @@ SRC_URI = "git://github.com/postgresql-interfaces/psqlodbc.git;protocol=https;br > file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ > file://psqlodbc-donot-use-the-hardcode-libdir.patch \ > file://psqlodbc-fix-for-ptest-support.patch \ > + file://add-expected-output-file-for-descrec-test.patch \ > file://run-ptest \ > " > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#120935): https://lists.openembedded.org/g/openembedded-devel/message/120935 > Mute This Topic: https://lists.openembedded.org/mt/115911779/6084445 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch deleted file mode 100644 index 9cc5ad9b86..0000000000 --- a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5bfa9f1cd0523a0cad70cacf5ecf8c1aeb06c4d0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <martin.jansa@gmail.com> -Date: Tue, 22 Apr 2025 17:47:02 +0000 -Subject: [PATCH] configure: make sure to call AC_CHECK_HEADER_STDBOOL - -before using ac_cv_sizeof_bool - -It was called after this conditional, so PG_USE_STDBOOL wasn't set -even when it should be as shown in at the end of config.log: - - ac_cv_header_stdbool_h=yes - ac_cv_sizeof_bool=1 - ac_cv_type__Bool=yes - #define SIZEOF_BOOL 1 - #define HAVE__BOOL 1 - #define HAVE_STDBOOL_H 1 - -* fixes: - https://github.com/postgresql-interfaces/psqlodbc/issues/110 - https://github.com/postgresql-interfaces/psqlodbc/issues/94 - -Upstream-Status: Submitted [https://github.com/postgresql-interfaces/psqlodbc/pull/112] - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f35c825..ea363ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,9 +28,11 @@ AC_CHECK_SIZEOF([bool], [], - #include <stdbool.h> - #endif]) - -+AC_CHECK_HEADER_STDBOOL() -+ - dnl We use <stdbool.h> if we have it and it declares type bool as having - dnl size 1. Otherwise, c.h will fall back to declaring bool as unsigned char. --if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then -+if test "$ac_cv_header_stdbool_h" = yes && test "$ac_cv_sizeof_bool" = 1; then - AC_DEFINE([PG_USE_STDBOOL], 1, - [Define to 1 to use <stdbool.h> to define type bool.]) - fi diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb similarity index 92% rename from meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb rename to meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb index dfd7f6a1e6..cead6789f4 100644 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb @@ -19,11 +19,11 @@ HOMEPAGE = "https://odbc.postgresql.org/" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" -SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \ +PV_WITH_USCORE = "${@d.getVar('PV').replace('.', '_')}" +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-donot-use-the-hardcode-libdir.patch \ file://psqlodbc-fix-for-ptest-support.patch \ - file://0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch \ file://run-ptest \ "
Drop patch that was merged into this release. Changelog: https://odbc.postgresql.org/docs/release.html Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> --- ...sure-to-call-AC_CHECK_HEADER_STDBOOL.patch | 45 ------------------- ...c_16.00.0000.bb => psqlodbc_17.00.0006.bb} | 4 +- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch rename meta-oe/recipes-dbs/psqlodbc/{psqlodbc_16.00.0000.bb => psqlodbc_17.00.0006.bb} (92%)