diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-10-18 14:38:55 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-10-18 14:38:55 +0000 |
| commit | 9b5360aa71faa737e238a264f8e4ef1739efc672 (patch) | |
| tree | 8eb71c299ca744b94048d0b8b9d3095fba69962f | |
| parent | 3556c6dd2787df747fe6f3ddb78b5599930beeac (diff) | |
| download | emacs-9b5360aa71faa737e238a264f8e4ef1739efc672.tar.gz | |
(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.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/sql.el | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87c2985e486..7eb8fb3b235 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,12 @@ * startup.el (fancy-splash-screens): Set buffer-undo-list to t. Use fancy-splash-delay. +2000-10-18 Alex Schroeder <alex@gnu.org> + + * progmodes/sql.el (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. + 2000-10-18 Vinicius Jose Latorre <vinicius@cpqd.com.br> * ps-print.el: Internal variable changes to defcustom, diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 09bd5957181..70b053899ac 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -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 @@ The program can also specify a TCP connection. See `make-comint'." :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 @@ If buffer exists and a process is running, just switch to buffer `*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 @@ The default comes from `process-coding-system-alist' and (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)) |