diff options
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf_0.47.0.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch new file mode 100644 index 0000000000..6be484fea3 --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 96ca7d0049461df2293dd0000edcbc69b64255e0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Sun, 3 May 2020 22:40:39 +0200 | ||
4 | Subject: [PATCH] Use single-quotes around string literals used in SQL | ||
5 | statements | ||
6 | |||
7 | If sqlite is built with -DSQLITE_DQS=0 in accordance with | ||
8 | https://sqlite.org/quirks.html#dblquote, migration to version 1.2 of the | ||
9 | history database would fail with: | ||
10 | |||
11 | History database cannot be created: /var/lib/dnf/history.sqlite. | ||
12 | Error: SQLite error on ":memory:": Executing an SQL statement failed: | ||
13 | no such column: 1.2 | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/951] | ||
16 | Signed-off-by: Peter Kjellerstedt <pkj@axis.com> | ||
17 | --- | ||
18 | libdnf/transaction/sql/migrate_tables_1_2.sql | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/libdnf/transaction/sql/migrate_tables_1_2.sql b/libdnf/transaction/sql/migrate_tables_1_2.sql | ||
22 | index 49b75315..f80ad1c4 100644 | ||
23 | --- a/libdnf/transaction/sql/migrate_tables_1_2.sql | ||
24 | +++ b/libdnf/transaction/sql/migrate_tables_1_2.sql | ||
25 | @@ -1,9 +1,9 @@ | ||
26 | R"**( | ||
27 | BEGIN TRANSACTION; | ||
28 | ALTER TABLE trans | ||
29 | - ADD comment TEXT DEFAULT ""; | ||
30 | + ADD comment TEXT DEFAULT ''; | ||
31 | UPDATE config | ||
32 | - SET value = "1.2" | ||
33 | + SET value = '1.2' | ||
34 | WHERE key = 'version'; | ||
35 | COMMIT; | ||
36 | )**" | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb index 1b4b7e4233..1b06d66b19 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb | |||
@@ -8,6 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ | |||
8 | file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ | 8 | file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ |
9 | file://0001-Add-WITH_TESTS-option.patch \ | 9 | file://0001-Add-WITH_TESTS-option.patch \ |
10 | file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ | 10 | file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ |
11 | file://0001-Use-single-quotes-around-string-literals-used-in-SQL.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRCREV = "8330eea6985c4e4b53796f858de5b6b38b1ddf5c" | 14 | SRCREV = "8330eea6985c4e4b53796f858de5b6b38b1ddf5c" |