From 324b8cd4242c96ca6a1779d74a45b0b672307975 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 24 Dec 2025 13:36:51 +0100 Subject: [PATCH] update emacsql --- bba.org | 2 +- custom.el | 2 +- .../README.md | 0 .../emacsql-autoloads.el | 0 .../emacsql-compiler.el | 0 .../emacsql-mysql.el | 0 .../emacsql-pg.el | 8 ++++---- .../emacsql-pkg.el | 6 +++--- .../emacsql-psql.el | 0 .../emacsql-sqlite-builtin.el | 5 +++-- .../emacsql-sqlite-module.el | 13 ++++++++----- .../emacsql-sqlite.el | 0 .../emacsql.el | 11 ++++++++--- 13 files changed, 28 insertions(+), 19 deletions(-) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/README.md (100%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-autoloads.el (100%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-compiler.el (100%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-mysql.el (100%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-pg.el (93%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-pkg.el (70%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-psql.el (100%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-sqlite-builtin.el (96%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-sqlite-module.el (88%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql-sqlite.el (100%) rename elpa/{emacsql-20250401.1500 => emacsql-20251130.1841}/emacsql.el (97%) diff --git a/bba.org b/bba.org index 202ef931..c8fa918a 100644 --- a/bba.org +++ b/bba.org @@ -261,7 +261,7 @@ from bash. BUGBUG #+begin_src sql emacs-lisp :tangle no - (add-to-list 'load-path "~/.emacs.d/elpa/emacsql-20250401.1500") + (add-to-list 'load-path "~/.emacs.d/elpa/emacsql-20251130.1841") (require 'emacsql) (add-to-list 'load-path "~/.emacs.d/elpa/emacsql-sqlite-20230225.2205") diff --git a/custom.el b/custom.el index 672ce6e5..98d7e2de 100644 --- a/custom.el +++ b/custom.el @@ -52,7 +52,7 @@ debian-changelog-mode demo-it detached dired+ dired-git dired-hacks-utils dired-narrow direx docker-cli docker-tramp dockerfile-mode dwim-shell-command eat edit-indirect - editorconfig eglot ejc-sql eldoc elfeed elfeed-org + editorconfig eglot ejc-sql eldoc elfeed elfeed-org emacsql emacsql-sqlite engine-mode epoch-view erlang eshell-bookmark eshell-vterm ess expand-region f fast-scroll flycheck flycheck-mmark flymake flymake-easy flymake-json diff --git a/elpa/emacsql-20250401.1500/README.md b/elpa/emacsql-20251130.1841/README.md similarity index 100% rename from elpa/emacsql-20250401.1500/README.md rename to elpa/emacsql-20251130.1841/README.md diff --git a/elpa/emacsql-20250401.1500/emacsql-autoloads.el b/elpa/emacsql-20251130.1841/emacsql-autoloads.el similarity index 100% rename from elpa/emacsql-20250401.1500/emacsql-autoloads.el rename to elpa/emacsql-20251130.1841/emacsql-autoloads.el diff --git a/elpa/emacsql-20250401.1500/emacsql-compiler.el b/elpa/emacsql-20251130.1841/emacsql-compiler.el similarity index 100% rename from elpa/emacsql-20250401.1500/emacsql-compiler.el rename to elpa/emacsql-20251130.1841/emacsql-compiler.el diff --git a/elpa/emacsql-20250401.1500/emacsql-mysql.el b/elpa/emacsql-20251130.1841/emacsql-mysql.el similarity index 100% rename from elpa/emacsql-20250401.1500/emacsql-mysql.el rename to elpa/emacsql-20251130.1841/emacsql-mysql.el diff --git a/elpa/emacsql-20250401.1500/emacsql-pg.el b/elpa/emacsql-20251130.1841/emacsql-pg.el similarity index 93% rename from elpa/emacsql-20250401.1500/emacsql-pg.el rename to elpa/emacsql-20251130.1841/emacsql-pg.el index d15ed597..649423f2 100644 --- a/elpa/emacsql-20250401.1500/emacsql-pg.el +++ b/elpa/emacsql-20251130.1841/emacsql-pg.el @@ -22,12 +22,12 @@ (if (>= emacs-major-version 28) (require 'pg nil t) (message "emacsql-pg.el requires Emacs 28.1 or later")) -(declare-function pg-connect "pg" +(declare-function pg-connect "ext:pg" ( dbname user &optional (password "") (host "localhost") (port 5432) (tls nil))) -(declare-function pg-disconnect "pg" (con)) -(declare-function pg-exec "pg" (connection &rest args)) -(declare-function pg-result "pg" (result what &rest arg)) +(declare-function pg-disconnect "ext:pg" (con)) +(declare-function pg-exec "ext:pg" (connection &rest args)) +(declare-function pg-result "ext:pg" (result what &rest arg)) (defclass emacsql-pg-connection (emacsql-connection) ((pgcon :reader emacsql-pg-pgcon :initarg :pgcon) diff --git a/elpa/emacsql-20250401.1500/emacsql-pkg.el b/elpa/emacsql-20251130.1841/emacsql-pkg.el similarity index 70% rename from elpa/emacsql-20250401.1500/emacsql-pkg.el rename to elpa/emacsql-20251130.1841/emacsql-pkg.el index e5a99bfe..505c3465 100644 --- a/elpa/emacsql-20250401.1500/emacsql-pkg.el +++ b/elpa/emacsql-20251130.1841/emacsql-pkg.el @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "emacsql" "20250401.1500" +(define-package "emacsql" "20251130.1841" "High-level SQL database front-end." '((emacs "26.1")) :url "https://github.com/magit/emacsql" - :commit "5470adaf5dcabebc80c913ac831258fd47a87cbe" - :revdesc "5470adaf5dca" + :commit "f177a41e93b92a4b1139a553eed5415ca33f439c" + :revdesc "f177a41e93b9" :authors '(("Christopher Wellons" . "wellons@nullprogram.com")) :maintainers '(("Jonas Bernoulli" . "emacs.emacsql@jonas.bernoulli.dev"))) diff --git a/elpa/emacsql-20250401.1500/emacsql-psql.el b/elpa/emacsql-20251130.1841/emacsql-psql.el similarity index 100% rename from elpa/emacsql-20250401.1500/emacsql-psql.el rename to elpa/emacsql-20251130.1841/emacsql-psql.el diff --git a/elpa/emacsql-20250401.1500/emacsql-sqlite-builtin.el b/elpa/emacsql-20251130.1841/emacsql-sqlite-builtin.el similarity index 96% rename from elpa/emacsql-20250401.1500/emacsql-sqlite-builtin.el rename to elpa/emacsql-20251130.1841/emacsql-sqlite-builtin.el index 94edd26c..2a7bf7f1 100644 --- a/elpa/emacsql-20250401.1500/emacsql-sqlite-builtin.el +++ b/elpa/emacsql-20251130.1841/emacsql-sqlite-builtin.el @@ -49,8 +49,9 @@ buffer. This is for debugging purposes." (and (oref connection handle) t)) (cl-defmethod emacsql-close ((connection emacsql-sqlite-builtin-connection)) - (sqlite-close (oref connection handle)) - (oset connection handle nil)) + (when (oref connection handle) + (sqlite-close (oref connection handle)) + (oset connection handle nil))) (cl-defmethod emacsql-send-message ((connection emacsql-sqlite-builtin-connection) message) diff --git a/elpa/emacsql-20250401.1500/emacsql-sqlite-module.el b/elpa/emacsql-20251130.1841/emacsql-sqlite-module.el similarity index 88% rename from elpa/emacsql-20250401.1500/emacsql-sqlite-module.el rename to elpa/emacsql-20251130.1841/emacsql-sqlite-module.el index 8dd1986e..be91b6bd 100644 --- a/elpa/emacsql-20250401.1500/emacsql-sqlite-module.el +++ b/elpa/emacsql-20251130.1841/emacsql-sqlite-module.el @@ -17,9 +17,11 @@ (require 'emacsql-sqlite) (require 'sqlite3 nil t) -(declare-function sqlite3-open "ext:sqlite3-api") -(declare-function sqlite3-exec "ext:sqlite3-api") -(declare-function sqlite3-close "ext:sqlite3-api") +;; Prevent check-declare from finding the defining file but then making +;; noise because it fails to find the definition because it is a module. +(declare-function sqlite3-open "ext:module:sqlite3-api") +(declare-function sqlite3-exec "ext:module:sqlite3-api") +(declare-function sqlite3-close "ext:module:sqlite3-api") (defvar sqlite-open-readwrite) (defvar sqlite-open-create) @@ -55,8 +57,9 @@ buffer. This is for debugging purposes." (and (oref connection handle) t)) (cl-defmethod emacsql-close ((connection emacsql-sqlite-module-connection)) - (sqlite3-close (oref connection handle)) - (oset connection handle nil)) + (when (oref connection handle) + (sqlite3-close (oref connection handle)) + (oset connection handle nil))) (cl-defmethod emacsql-send-message ((connection emacsql-sqlite-module-connection) message) diff --git a/elpa/emacsql-20250401.1500/emacsql-sqlite.el b/elpa/emacsql-20251130.1841/emacsql-sqlite.el similarity index 100% rename from elpa/emacsql-20250401.1500/emacsql-sqlite.el rename to elpa/emacsql-20251130.1841/emacsql-sqlite.el diff --git a/elpa/emacsql-20250401.1500/emacsql.el b/elpa/emacsql-20251130.1841/emacsql.el similarity index 97% rename from elpa/emacsql-20250401.1500/emacsql.el rename to elpa/emacsql-20251130.1841/emacsql.el index baea0210..74c4213c 100644 --- a/elpa/emacsql-20250401.1500/emacsql.el +++ b/elpa/emacsql-20251130.1841/emacsql.el @@ -6,8 +6,8 @@ ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/emacsql -;; Package-Version: 20250401.1500 -;; Package-Revision: 5470adaf5dca +;; Package-Version: 20251130.1841 +;; Package-Revision: f177a41e93b9 ;; Package-Requires: ((emacs "26.1")) ;; SPDX-License-Identifier: Unlicense @@ -19,6 +19,11 @@ ;; PostgreSQL and MySQL are also supported, but use of these connectors ;; is not recommended. +;; Any readable lisp value can be stored as a value in EmacSQL, +;; including numbers, strings, symbols, lists, vectors, and closures. +;; EmacSQL has no concept of TEXT values; it's all just lisp objects. +;; The lisp object `nil' corresponds 1:1 with NULL in the database. + ;; See README.md for much more complete documentation. ;;; Code: @@ -33,7 +38,7 @@ "The EmacSQL SQL database front-end." :group 'comm) -(defconst emacsql-version "4.3.0") +(defconst emacsql-version "4.3.3") (defvar emacsql-global-timeout 30 "Maximum number of seconds to wait before bailing out on a SQL command. -- 2.47.3