From 3524e45d407116c711baaad82e9de2e58ea96b1b Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 21 May 2025 13:54:46 +0200 Subject: [PATCH] updaet closql --- .../closql-autoloads.el | 0 .../closql-pkg.el | 12 ++++++------ .../closql.el | 19 ++++++++++++------- 3 files changed, 18 insertions(+), 13 deletions(-) rename elpa/{closql-20241201.1553 => closql-20250301.2221}/closql-autoloads.el (100%) rename elpa/{closql-20241201.1553 => closql-20250301.2221}/closql-pkg.el (56%) rename elpa/{closql-20241201.1553 => closql-20250301.2221}/closql.el (98%) diff --git a/elpa/closql-20241201.1553/closql-autoloads.el b/elpa/closql-20250301.2221/closql-autoloads.el similarity index 100% rename from elpa/closql-20241201.1553/closql-autoloads.el rename to elpa/closql-20250301.2221/closql-autoloads.el diff --git a/elpa/closql-20241201.1553/closql-pkg.el b/elpa/closql-20250301.2221/closql-pkg.el similarity index 56% rename from elpa/closql-20241201.1553/closql-pkg.el rename to elpa/closql-20250301.2221/closql-pkg.el index 1aab5242..c312f6c5 100644 --- a/elpa/closql-20241201.1553/closql-pkg.el +++ b/elpa/closql-20250301.2221/closql-pkg.el @@ -1,12 +1,12 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "closql" "20241201.1553" +(define-package "closql" "20250301.2221" "Store EIEIO objects using EmacSQL." '((emacs "26.1") - (compat "30.0.0.0") - (emacsql "4.1.0")) - :url "https://github.com/magit/closql" - :commit "b1522c4bcb3a30eba0b49513c6d61dd7817baf1a" - :revdesc "b1522c4bcb3a" + (compat "30.0.2.0") + (emacsql "4.2.0")) + :url "https://github.com/emacscollective/closql" + :commit "dc7924c1d206483a2555a98470c96fadf419f32d" + :revdesc "dc7924c1d206" :keywords '("extensions") :authors '(("Jonas Bernoulli" . "emacs.closql@jonas.bernoulli.dev")) :maintainers '(("Jonas Bernoulli" . "emacs.closql@jonas.bernoulli.dev"))) diff --git a/elpa/closql-20241201.1553/closql.el b/elpa/closql-20250301.2221/closql.el similarity index 98% rename from elpa/closql-20241201.1553/closql.el rename to elpa/closql-20250301.2221/closql.el index ae9855d9..a02dfde9 100644 --- a/elpa/closql-20241201.1553/closql.el +++ b/elpa/closql-20250301.2221/closql.el @@ -1,17 +1,17 @@ ;;; closql.el --- Store EIEIO objects using EmacSQL -*- lexical-binding:t -*- -;; Copyright (C) 2016-2024 Jonas Bernoulli +;; Copyright (C) 2016-2025 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/emacscollective/closql ;; Keywords: extensions -;; Package-Version: 20241201.1553 -;; Package-Revision: b1522c4bcb3a +;; Package-Version: 20250301.2221 +;; Package-Revision: dc7924c1d206 ;; Package-Requires: ( ;; (emacs "26.1") -;; (compat "30.0.0.0") -;; (emacsql "4.1.0")) +;; (compat "30.0.2.0") +;; (emacsql "4.2.0")) ;; SPDX-License-Identifier: GPL-3.0-or-later @@ -183,7 +183,7 @@ (aset (eieio--class-class-allocation-values class) c value)) (slot-missing obj slot 'oset value))))) -(cl-defgeneric closql-dset (obj slot value) +(cl-defgeneric closql-dset (obj slot value &optional drop-unknown) (let* ((db (closql--oref obj 'closql-database)) (key (oref-default obj closql-primary-key)) (id (closql--oref obj key)) @@ -242,6 +242,11 @@ (cdr elt2))) (pop list1) (pop list2)) + (drop-unknown + (ignore-errors + (emacsql db [:insert-into $i1 :values $v2] + table (vconcat (cons id elt2)))) + (pop list2)) (t (emacsql db [:insert-into $i1 :values $v2] table (vconcat (cons id elt2))) @@ -551,7 +556,7 @@ (mapc (lambda (arg) (let ((str (symbol-name arg))) (unless (string-match "\\`\\(!\\)?\\([^*]+\\)\\(\\*\\)?\\'" str) - (error "closql-where-class-in: invalid type: %s" arg)) + (error "`closql-where-class-in': invalid type: %s" arg)) (let* ((exclude (match-beginning 1)) (a (intern (match-string 2 str))) (a (cond ((match-beginning 3) -- 2.47.3