Mercurial > emacs
changeset 32621:50c28d51e0f2
(sql-sybase-options): New option.
(sql-sybase): Use it. Add sql-database to the list of parameters
provided for login. The options -w 2048 -n are not used any more.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 18 Oct 2000 14:38:26 +0000 |
| parents | e316ddc98747 |
| children | 1025b13bfe71 |
| files | lisp/progmodes/sql.el |
| diffstat | 1 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/sql.el Wed Oct 18 14:31:05 2000 +0000 +++ b/lisp/progmodes/sql.el Wed Oct 18 14:38:26 2000 +0000 @@ -4,7 +4,7 @@ ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Alex Schroeder <alex@gnu.org> -;; Version: 1.4.22 +;; Version: 1.4.23 ;; Keywords: comm languages processes ;; This file is part of GNU Emacs. @@ -300,6 +300,13 @@ :type 'file :group 'SQL) +(defcustom sql-sybase-options nil + "*List of additional options for `sql-sybase-program'. +Some versions of isql might require the -n option in order to work." + :type '(repeat string) + :version "20.8" + :group 'SQL) + ;; Customisation for Informix (defcustom sql-informix-program "dbaccess" @@ -1267,8 +1274,8 @@ `*SQL*'. Interpreter used comes from variable `sql-sybase-program'. Login uses -the variables `sql-user', `sql-password', and `sql-server' as -defaults, if set. +the variables `sql-server', `sql-user', `sql-password', and +`sql-database' as defaults, if set. The buffer is put in sql-interactive-mode, giving commands for sending input. See `sql-interactive-mode'. @@ -1284,15 +1291,15 @@ (interactive) (if (comint-check-proc "*SQL*") (pop-to-buffer "*SQL*") - (sql-get-login 'user 'password 'server) + (sql-get-login 'server 'user 'password 'server) (message "Login...") ;; Put all parameters to the program (if defined) in a list and call ;; make-comint. - (let ((params '("-w" "2048" "-n"))) - ;; There is no way to specify the database via command line - ;; parameters. The -S option specifies the server. + (let ((params sql-sybase-options)) (if (not (string= "" sql-server)) (setq params (append (list "-S" sql-server) params))) + (if (not (string= "" sql-database)) + (setq params (append (list "-D" sql-database) params))) (if (not (string= "" sql-password)) (setq params (append (list "-P" sql-password) params))) (if (not (string= "" sql-user))