From 4928a9f55df0f3afe76e503fd0f858deadccd50e Mon Sep 17 00:00:00 2001
From: Thanh Vuong <thanhvg@gmail.com>
Date: Wed, 1 Jul 2020 16:56:11 -0600
Subject: [PATCH] [sql] fix regession by #13718

remove sql-mode which is not a package move its init to init-sql
---
 layers/+lang/sql/packages.el | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/layers/+lang/sql/packages.el b/layers/+lang/sql/packages.el
index 0a7877eb6..b20db2668 100644
--- a/layers/+lang/sql/packages.el
+++ b/layers/+lang/sql/packages.el
@@ -14,7 +14,6 @@
         company
         org
         sql
-        sql-mode
         ;; This mode is more up-to-date than the MELPA one.
         ;; Turns out that it is available in GNU ELPA but we cannot
         ;; force Spacemacs to fetch from it for now, it will always
@@ -31,7 +30,11 @@
 (defun sql/init-sql ()
   (use-package sql
     :defer t
-    :init (spacemacs/register-repl 'sql 'spacemacs/sql-start "sql")
+    :init
+    (progn
+      (spacemacs/register-repl 'sql 'spacemacs/sql-start "sql")
+      (add-hook 'sql-mode-hook
+                'spacemacs//sql-setup-backend))
     :config
     (progn
       (setq
@@ -41,7 +44,6 @@
       (advice-add 'sql-add-product :after #'spacemacs/sql-populate-products-list)
       (advice-add 'sql-del-product :after #'spacemacs/sql-populate-products-list)
       (spacemacs/sql-populate-products-list)
-
       (defun spacemacs//sql-source (products)
         "return a source for helm selection"
         `((name . "SQL Products")
@@ -182,12 +184,6 @@
                           (t nil))))
         (setq lsp-sqls-workspace-config-path path-config)))))
 
-(defun sql/init-sql-mode ()
-  (use-package sql-mode
-    :defer t
-    :init (add-hook 'sql-mode-hook
-                    'spacemacs//sql-setup-backend)))
-
 (defun sql/init-sql-indent ()
   (use-package sql-indent
     :if sql-auto-indent