emacs-27 e274e3f: 2020-03-29 Michael R. Mauger <address@hidden>

[Lars Ingebrigtsen]

branch: emacs-27
commit e274e3f44b07e1cf6186329679ef18ab41eab2f6
Author: Michael R. Mauger <michael@mauger.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    2020-03-29  Michael R. Mauger  <michael@mauger.com>
    
           * lisp/progmodes/sql.el (sql-add-product): Re-correct argument
           spec.  Previous change was due to my mistake; I have
           resolved back to the prior behavior (Bug#39960).
           * test/lisp/progmodes/sql-tests.el (sql-test-add-product): Added
           test to insure I don't make the same mistake again.
---
 lisp/progmodes/sql.el            | 2 +-
 test/lisp/progmodes/sql-tests.el | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 400e304..a04c26d 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2740,7 +2740,7 @@ highlighting rules in SQL mode.")
              nil 'require-match
              init 'sql-product-history init))))
 
-(defun sql-add-product (product display &optional plist)
+(defun sql-add-product (product display &rest plist)
   "Add support for a database product in `sql-mode'.
 
 Add PRODUCT to `sql-product-alist' which enables `sql-mode' to
diff --git a/test/lisp/progmodes/sql-tests.el b/test/lisp/progmodes/sql-tests.el
index 65ed76b..91805ab 100644
--- a/test/lisp/progmodes/sql-tests.el
+++ b/test/lisp/progmodes/sql-tests.el
@@ -187,7 +187,13 @@ Perform ACTION and validate results"
       (sql-add-product 'xyz "XyzDb")
 
       (should (equal (pp-to-string (assoc 'xyz sql-product-alist))
-                     "(xyz :name \"XyzDb\")\n"))))
+                     "(xyz :name \"XyzDb\")\n")))
+
+  (sql-test-product-feature-harness
+      (sql-add-product 'stu "StuDb" :X 1 :Y "2")
+
+      (should (equal (pp-to-string (assoc 'stu sql-product-alist))
+                     "(stu :name \"StuDb\" :X 1 :Y \"2\")\n"))))
 
 (ert-deftest sql-test-add-existing-product ()
   "Add a product that already exists."