From: Glenn Morris <rgm@gnu.org>
Date: Sat, 14 Feb 2009 03:38:00 +0000 (+0000)
Subject: Ian Eure  <ian at digg.com>  (tiny change)
X-Git-Tag: emacs-pretest-23.0.91~225
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5107fea3e890e8641dde9faa0958c8dba2dda1d;p=emacs.git

Ian Eure  <ian at digg.com>  (tiny change)

(sql-product-alist, sql-connect-sqlite): Remove host, user, password
options not applicable to SQlite. (Bug#1904)
---

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 2e5dea59605..da0794b1f2b 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -356,7 +356,7 @@ highlighted properly when you open them."
      :sqli-prompt-length 0)
     (sqlite
      :font-lock sql-mode-sqlite-font-lock-keywords
-     :sqli-login (user password server database)
+     :sqli-login (database)
      :sqli-connect sql-connect-sqlite
      :sqli-prompt-regexp "^sqlite> "
      :sqli-prompt-length 8)
@@ -2611,12 +2611,6 @@ parameters and command options."
   (let ((params))
     (if (not (string= "" sql-database))
 	(setq params (append (list sql-database) params)))
-    (if (not (string= "" sql-server))
-	(setq params (append (list (concat "--host=" sql-server)) params)))
-    (if (not (string= "" sql-password))
-	(setq params (append (list (concat "--password=" sql-password)) params)))
-    (if (not (string= "" sql-user))
-	(setq params (append (list (concat "--user=" sql-user)) params)))
     (if (not (null sql-sqlite-options))
 	(setq params (append sql-sqlite-options params)))
     (set-buffer (apply 'make-comint "SQL" sql-sqlite-program