mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 00:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

libdnf: Use single-quotes around string literals used in SQL statements

Browse Source 
If sqlite is built with -DSQLITE_DQS=0 in accordance with
https://sqlite.org/quirks.html#dblquote, migration to version 1.2 of the
history database would fail with:

  History database cannot be created: .../var/lib/dnf/history.sqlite.
  Error: SQLite error on ":memory:": Executing an SQL statement failed:
  no such column: 1.2

(From OE-Core rev: 61d34df201cf6498854fa9258c320437b97071a4)

Signed-off-by: Peter Kjellerstedt <pkj@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2020-05-03 23:15:15 +02:00
committed by Richard Purdie
parent e568c8ec2a
commit a197c96039
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch Normal file
View File

@@ -0,0 +1,36 @@
From 96ca7d0049461df2293dd0000edcbc69b64255e0 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Sun, 3 May 2020 22:40:39 +0200
Subject: [PATCH] Use single-quotes around string literals used in SQL
statements
If sqlite is built with -DSQLITE_DQS=0 in accordance with
https://sqlite.org/quirks.html#dblquote, migration to version 1.2 of the
history database would fail with:
History database cannot be created: /var/lib/dnf/history.sqlite.
Error: SQLite error on ":memory:": Executing an SQL statement failed:
no such column: 1.2
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/951]
Signed-off-by: Peter Kjellerstedt <pkj@axis.com>
---
libdnf/transaction/sql/migrate_tables_1_2.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libdnf/transaction/sql/migrate_tables_1_2.sql b/libdnf/transaction/sql/migrate_tables_1_2.sql
index 49b75315..f80ad1c4 100644
--- a/libdnf/transaction/sql/migrate_tables_1_2.sql
+++ b/libdnf/transaction/sql/migrate_tables_1_2.sql
@@ -1,9 +1,9 @@
R"**(
BEGIN TRANSACTION;
ALTER TABLE trans
- ADD comment TEXT DEFAULT "";
+ ADD comment TEXT DEFAULT '';
UPDATE config
- SET value = "1.2"
+ SET value = '1.2'
WHERE key = 'version';
COMMIT;
)**"

1
meta/recipes-devtools/libdnf/libdnf_0.47.0.bb
View File

@@ -8,6 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
file://0001-Add-WITH_TESTS-option.patch \
file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
file://0001-Use-single-quotes-around-string-literals-used-in-SQL.patch \
"
SRCREV = "8330eea6985c4e4b53796f858de5b6b38b1ddf5c"