[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/emacsql 8ebf559f58: Remove emacsql-sqlite.el
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/emacsql 8ebf559f58: Remove emacsql-sqlite.el |
Date: |
Sat, 16 Nov 2024 12:59:33 -0500 (EST) |
branch: elpa/emacsql
commit 8ebf559f58fdeba53d23e80562181fb67917942e
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Remove emacsql-sqlite.el
Should have been removed in [1: 7a79c2b].
1: 2024-11-15 7a79c2be3da818b7e14a53b9f29e44ac27236c0a
Remove original connector using a custom SQLite binary
---
emacsql-sqlite.el | 181 ------------------------------------------------------
1 file changed, 181 deletions(-)
diff --git a/emacsql-sqlite.el b/emacsql-sqlite.el
deleted file mode 100644
index 2f51c8fbde..0000000000
--- a/emacsql-sqlite.el
+++ /dev/null
@@ -1,181 +0,0 @@
-;;; emacsql-sqlite.el --- EmacSQL back-end for SQLite -*- lexical-binding:t
-*-
-
-;; This is free and unencumbered software released into the public domain.
-
-;; Author: Christopher Wellons <wellons@nullprogram.com>
-;; Maintainer: Jonas Bernoulli <emacs.emacsql@jonas.bernoulli.dev>
-
-;; SPDX-License-Identifier: Unlicense
-
-;;; Commentary:
-
-;; This library provides the original EmacSQL back-end for SQLite,
-;; which uses a custom binary for communicating with a SQLite database.
-
-;; During package installation an attempt is made to compile the binary.
-
-;;; Code:
-
-(eval-when-compile (require 'subr-x))
-
-(require 'emacsql)
-(require 'emacsql-sqlite-common)
-
-(emacsql-register-reserved emacsql-sqlite-reserved)
-
-;;; SQLite connection
-
-(defvar emacsql-sqlite-data-root
- (file-name-directory (or load-file-name buffer-file-name))
- "Directory where EmacSQL is installed.")
-
-(defvar emacsql-sqlite-executable-path
- (if (memq system-type '(windows-nt cygwin ms-dos))
- "sqlite/emacsql-sqlite.exe"
- "sqlite/emacsql-sqlite")
- "Relative path to emacsql executable.")
-
-(defvar emacsql-sqlite-executable
- (expand-file-name emacsql-sqlite-executable-path
- (if (or (file-writable-p emacsql-sqlite-data-root)
- (file-exists-p (expand-file-name
- emacsql-sqlite-executable-path
- emacsql-sqlite-data-root)))
- emacsql-sqlite-data-root
- (expand-file-name
- (concat "emacsql/" emacsql-version)
- user-emacs-directory)))
- "Path to the EmacSQL backend (this is not the sqlite3 shell).")
-
-(defvar emacsql-sqlite-c-compilers '("cc" "gcc" "clang")
- "List of names to try when searching for a C compiler.
-
-Each is queried using `executable-find', so full paths are
-allowed. Only the first compiler which is successfully found will
-used.")
-
-(defclass emacsql-sqlite-connection
- (emacsql--sqlite-base emacsql-protocol-mixin) ()
- "A connection to a SQLite database.")
-
-(cl-defmethod initialize-instance :after
- ((connection emacsql-sqlite-connection) &rest _rest)
- (emacsql-sqlite-ensure-binary)
- (let* ((process-connection-type nil) ; use a pipe
- ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60872#11.
- (coding-system-for-write 'utf-8)
- (coding-system-for-read 'utf-8)
- (file (oref connection file))
- (buffer (generate-new-buffer " *emacsql-sqlite*"))
- (fullfile (if file (expand-file-name file) ":memory:"))
- (process (start-process
- "emacsql-sqlite" buffer emacsql-sqlite-executable
fullfile)))
- (oset connection handle process)
- (set-process-sentinel process
- (lambda (proc _) (kill-buffer (process-buffer
proc))))
- (when (memq (process-status process) '(exit signal))
- (error "%s has failed immediately" emacsql-sqlite-executable))
- (emacsql-wait connection)
- (emacsql-sqlite-set-busy-timeout connection)
- (emacsql-register connection)))
-
-(cl-defun emacsql-sqlite (file &key debug)
- "Open a connected to database stored in FILE.
-If FILE is nil use an in-memory database.
-
-:debug LOG -- When non-nil, log all SQLite commands to a log
-buffer. This is for debugging purposes."
- (let ((connection (make-instance 'emacsql-sqlite-connection :file file)))
- (set-process-query-on-exit-flag (oref connection handle) nil)
- (when debug
- (emacsql-enable-debugging connection))
- connection))
-
-(cl-defmethod emacsql-close ((connection emacsql-sqlite-connection))
- "Gracefully exits the SQLite subprocess."
- (let ((process (oref connection handle)))
- (when (process-live-p process)
- (process-send-eof process))))
-
-(cl-defmethod emacsql-send-message ((connection emacsql-sqlite-connection)
message)
- (let ((process (oref connection handle)))
- (process-send-string process (format "%d " (string-bytes message)))
- (process-send-string process message)
- (process-send-string process "\n")))
-
-(cl-defmethod emacsql-handle ((_ emacsql-sqlite-connection) errcode errmsg)
- "Get condition for ERRCODE and ERRMSG provided from SQLite."
- (pcase-let ((`(,_ ,_ ,signal ,errstr)
- (assq errcode emacsql-sqlite-error-codes)))
- (signal (or signal 'emacsql-error)
- (list errmsg errcode nil errstr))))
-
-;;; SQLite compilation
-
-(defun emacsql-sqlite-compile-switches ()
- "Return the compilation switches from the Makefile under sqlite/."
- (let ((makefile (expand-file-name "sqlite/Makefile"
emacsql-sqlite-data-root))
- (case-fold-search nil))
- (with-temp-buffer
- (insert-file-contents makefile)
- (goto-char (point-min))
- (cl-loop while (re-search-forward "-D[A-Z0-9_=]+" nil :no-error)
- collect (match-string 0)))))
-
-(defun emacsql-sqlite-compile (&optional o-level async error)
- "Compile the SQLite back-end for EmacSQL, returning non-nil on success.
-If called with non-nil ASYNC, the return value is meaningless.
-If called with non-nil ERROR, signal an error on failure."
- (let* ((cc (cl-loop for option in emacsql-sqlite-c-compilers
- for path = (executable-find option)
- if path return it))
- (src (expand-file-name "sqlite" emacsql-sqlite-data-root))
- (files (mapcar (lambda (f) (expand-file-name f src))
- '("sqlite3.c" "emacsql.c")))
- (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2))))
- (ldlibs (cl-case system-type
- (windows-nt (list))
- (berkeley-unix (list "-lm"))
- (otherwise (list "-lm" "-ldl"))))
- (options (emacsql-sqlite-compile-switches))
- (output (list "-o" emacsql-sqlite-executable))
- (arguments (nconc cflags options files ldlibs output)))
- (cond
- ((not cc)
- (funcall (if error #'error #'message)
- "Could not find C compiler, skipping SQLite build")
- nil)
- (t
- (message "Compiling EmacSQL SQLite binary...")
- (mkdir (file-name-directory emacsql-sqlite-executable) t)
- (let ((log (get-buffer-create byte-compile-log-buffer)))
- (with-current-buffer log
- (let ((inhibit-read-only t))
- (insert (string-join (cons cc arguments) " ") "\n")
- (let ((pos (point))
- (ret (apply #'call-process cc nil (if async 0 t) t
- arguments)))
- (cond
- ((zerop ret)
- (message "Compiling EmacSQL SQLite binary...done")
- t)
- ((and error (not async))
- (error "Cannot compile EmacSQL SQLite binary: %S"
- (replace-regexp-in-string
- "\n" " "
- (buffer-substring-no-properties
- pos (point-max))))))))))))))
-
-;;; Ensure the SQLite binary is available
-
-(defun emacsql-sqlite-ensure-binary ()
- "Ensure the EmacSQL SQLite binary is available, signaling an error if not."
- (unless (file-exists-p emacsql-sqlite-executable)
- ;; Try compiling at the last minute.
- (condition-case err
- (emacsql-sqlite-compile 2 nil t)
- (error (error "No EmacSQL SQLite binary available: %s" (cdr err))))))
-
-(provide 'emacsql-sqlite)
-
-;;; emacsql-sqlite.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [nongnu] elpa/emacsql 8ebf559f58: Remove emacsql-sqlite.el,
ELPA Syncer <=