emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/triples b5439fea7e: Fix incorrect SQL on conflict resol


From: ELPA Syncer
Subject: [elpa] externals/triples b5439fea7e: Fix incorrect SQL on conflict resolution when upgrading
Date: Thu, 22 Jun 2023 15:59:55 -0400 (EDT)

branch: externals/triples
commit b5439fea7e5fbc9f2f7a6b2ef2a065c026371b46
Author: Andrew Hyatt <ahyatt@gmail.com>
Commit: Andrew Hyatt <ahyatt@gmail.com>

    Fix incorrect SQL on conflict resolution when upgrading
---
 NEWS.org           | 2 ++
 triples-upgrade.el | 2 +-
 triples.el         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index fbf4ea6f4d..655c2300e9 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,5 +1,7 @@
 TITLE: Changelog for the triples module for GNU Emacs.
 
+* 0.3.3
+- Fix error in upgrade code SQL that occurs when integer conflicts are found.
 * 0.3.2
 - Remove hard dependency on the sqlite library, which is a problem for emacs 
28 users.
 * 0.3.1
diff --git a/triples-upgrade.el b/triples-upgrade.el
index 529aa8bf9d..54ef8d91fe 100644
--- a/triples-upgrade.el
+++ b/triples-upgrade.el
@@ -75,7 +75,7 @@ be correct by default."
                                                    (y-or-n-p (format "triples: 
For subject %d, existing real integer subject found.  Replace for this and 
others? "
                                                                      
int-val))))
                                       (setq replace-approved t)
-                                        (sqlite-execute db "DELETE FROM 
triples WHERE subject = ? AND typeof(subject) = 'integer"
+                                        (sqlite-execute db "DELETE FROM 
triples WHERE subject = ? AND typeof(subject) = 'integer'"
                                                         (list int-val))))
                               (sqlite-execute db (format "UPDATE OR REPLACE 
triples SET %s = cast(REPLACE(%s, '\"', '') as integer) WHERE %s = ?"
                                                          column column column)
diff --git a/triples.el b/triples.el
index 63848f3719..ef9bdc1031 100644
--- a/triples.el
+++ b/triples.el
@@ -6,7 +6,7 @@
 ;; Homepage: https://github.com/ahyatt/triples
 ;; Package-Requires: ((seq "2.0") (emacs "28.1"))
 ;; Keywords: triples, kg, data, sqlite
-;; Version: 0.3.2
+;; Version: 0.3.3
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 2 of the



reply via email to

[Prev in Thread] Current Thread [Next in Thread]