branch: elpa/emacsql
commit 65357c6b8e96f4d1533bcc3100eeee6c34f70f46
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Require cl-lib et al. only in emacsql
The `emacsql-BACKEND' libraries all require `emacsql', which requires
`cl-lib', `cl-generic' and `eieio'. It is not necessary to also
require these libraries in `emacsql-BACKEND'.
---
emacsql-mysql.el | 3 ---
emacsql-pg.el | 6 ++----
emacsql-psql.el | 3 ---
emacsql-sqlite.el | 3 ---
emacsql.el | 1 +
5 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/emacsql-mysql.el b/emacsql-mysql.el
index 2df7b86634..3a01cf7759 100644
--- a/emacsql-mysql.el
+++ b/emacsql-mysql.el
@@ -17,9 +17,6 @@
;;; Code:
-(require 'cl-lib)
-(require 'cl-generic)
-(require 'eieio)
(require 'emacsql)
(defvar emacsql-mysql-executable "mysql"
diff --git a/emacsql-pg.el b/emacsql-pg.el
index 6f1789dfa6..c039fde856 100644
--- a/emacsql-pg.el
+++ b/emacsql-pg.el
@@ -19,6 +19,8 @@
;;; Code:
+(require 'emacsql)
+
(unless (require 'pg nil t)
(declare-function pg-connect "pg"
( dbname user &optional
@@ -26,10 +28,6 @@
(declare-function pg-disconnect "pg" (con))
(declare-function pg-exec "pg" (connection &rest args))
(declare-function pg-result "pg" (result what &rest arg)))
-(require 'eieio)
-(require 'cl-lib)
-(require 'cl-generic)
-(require 'emacsql)
(defclass emacsql-pg-connection (emacsql-connection)
((pgcon :reader emacsql-pg-pgcon :initarg :pgcon)
diff --git a/emacsql-psql.el b/emacsql-psql.el
index f33614accb..d24da6b539 100644
--- a/emacsql-psql.el
+++ b/emacsql-psql.el
@@ -18,9 +18,6 @@
;;; Code:
-(require 'cl-lib)
-(require 'cl-generic)
-(require 'eieio)
(require 'emacsql)
(defvar emacsql-psql-executable "psql"
diff --git a/emacsql-sqlite.el b/emacsql-sqlite.el
index 1500c6f860..2c084cd0e4 100644
--- a/emacsql-sqlite.el
+++ b/emacsql-sqlite.el
@@ -19,9 +19,6 @@
;;; Code:
-(require 'cl-lib)
-(require 'cl-generic)
-(require 'eieio)
(require 'emacsql)
(emacsql-register-reserved emacsql-sqlite-reserved)
diff --git a/emacsql.el b/emacsql.el
index bba293a7f1..8c4da41e8c 100644
--- a/emacsql.el
+++ b/emacsql.el
@@ -66,6 +66,7 @@
(require 'cl-lib)
(require 'cl-generic)
(require 'eieio)
+
(require 'emacsql-compiler)
(defgroup emacsql nil
