rpms/perl-DBD-SQLite
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adapt to SQLite-3.38.0

Browse Source
This commit is contained in:
Petr Písař 2022-03-18 10:17:41 +01:00
parent ef26c52c67
commit f6aedf345a
3 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
DBD-SQLite-1.70-Lowercase-datatype.patch Normal file
View File

@ -0,0 +1,54 @@
From 1fa475684275fb7fb089b2fc84a843d2d16068f0 Mon Sep 17 00:00:00 2001
From: Kenichi Ishigaki <ishigaki@cpan.org>
Date: Sat, 26 Feb 2022 11:20:41 +0900
Subject: [PATCH] Lowercase datatype
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Petr Písař: Ported to 1.70 from
abc241d7114e3fdf8a2336aef96e290ec6b59a75.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dbdimp.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/dbdimp.c b/dbdimp.c
index ca89c7c..c38600f 100644
--- a/dbdimp.c
+++ b/dbdimp.c
@@ -1924,6 +1924,21 @@ sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc)
#endif
+SV* _lc(SV* sv) {
+ int i, l;
+ char* pv;
+ if (SvPOK(sv)) {
+ pv = SvPV_nolen(sv);
+ l = strlen(pv);
+ for(i = 0; i < l; i++) {
+ if (pv[i] >= 'A' && pv[i] <= 'Z') {
+ pv[i] = pv[i] - 'A' + 'a';
+ }
+ }
+ }
+ return sv;
+}
+
HV*
sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *columnname)
{
@@ -1960,7 +1975,7 @@ sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *co
#endif
if (rc == SQLITE_OK) {
- hv_stores(metadata, "data_type", datatype ? newSVpv(datatype, 0) : newSV(0));
+ hv_stores(metadata, "data_type", datatype ? _lc(newSVpv(datatype, 0)) : newSV(0));
hv_stores(metadata, "collation_name", collseq ? newSVpv(collseq, 0) : newSV(0));
hv_stores(metadata, "not_null", newSViv(notnull));
hv_stores(metadata, "primary", newSViv(primary));
--
2.34.1

38
DBD-SQLite-1.71_04-THX.patch Normal file
View File

@ -0,0 +1,38 @@
From b6a4eb43a7ae3e5e6edaf347f91520853f727a24 Mon Sep 17 00:00:00 2001
From: Kenichi Ishigaki <ishigaki@cpan.org>
Date: Sat, 26 Feb 2022 11:28:39 +0900
Subject: [PATCH 2/2] THX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dbdimp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dbdimp.c b/dbdimp.c
index 95232b7..2c5b32d 100644
--- a/dbdimp.c
+++ b/dbdimp.c
@@ -1928,7 +1928,7 @@ sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc)
#endif
-SV* _lc(SV* sv) {
+SV* _lc(pTHX_ SV* sv) {
int i, l;
char* pv;
if (SvPOK(sv)) {
@@ -1979,7 +1979,7 @@ sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *co
#endif
if (rc == SQLITE_OK) {
- hv_stores(metadata, "data_type", datatype ? _lc(newSVpv(datatype, 0)) : newSV(0));
+ hv_stores(metadata, "data_type", datatype ? _lc(aTHX_ newSVpv(datatype, 0)) : newSV(0));
hv_stores(metadata, "collation_name", collseq ? newSVpv(collseq, 0) : newSV(0));
hv_stores(metadata, "not_null", newSViv(notnull));
hv_stores(metadata, "primary", newSViv(primary));
--
2.34.1

13
perl-DBD-SQLite.spec
View File

@ -3,7 +3,7 @@
Name: perl-DBD-SQLite
Version: 1.70
Release: 2%{?dist}
Release: 3%{?dist}
Summary: SQLite DBI Driver
# lib/DBD/SQLite.pm: GPL+ or Artistic
# LICENSE: GPL+ or Artistic
@ -21,6 +21,12 @@ Patch0: perl-DBD-SQLite-bz543982.patch
Patch1: DBD-SQLite-1.62-Remove-bundled-source-extentions.patch
# Adapt tests to unbundled Test::FailWarnings
Patch2: DBD-SQLite-1.64-Unbundle-Test-FailWarnings.patch
# 1/2 Adapt to SQLite-3.38.0, bug #2065567, upstream bug GH#92,
# in upstream 1.71_05
Patch3: DBD-SQLite-1.70-Lowercase-datatype.patch
# 2/2 Adapt to SQLite-3.38.0, bug #2065567, upstream bug GH#92,
# in upstream 1.71_05
Patch4: DBD-SQLite-1.71_04-THX.patch
# if sqlite >= 3.6.0 then
# perl-DBD-SQLite uses the external library
# else
@ -86,6 +92,8 @@ SQLite.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# Remove bundled sqlite libraries (BZ#1059154)
# System libraries will be used
rm sqlite*
@ -119,6 +127,9 @@ make test
%{_mandir}/man3/*.3pm*
%changelog
* Fri Mar 18 2022 Petr Pisar <ppisar@redhat.com> - 1.70-3
- Adapt to SQLite-3.38.0 (bug #2065567)
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.70-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild