diff options
| author | Rolf Ade <rolf@pointsman.de> | 2017-01-02 20:05:37 -0500 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-01-07 11:20:17 -0500 |
| commit | 75cdf429179c6459c10f15578fb32236a8821e4b (patch) | |
| tree | e0d2956e05fb8039bf3a4ac5b8b52368fce8ed73 /lisp/progmodes/sql.el | |
| parent | e272032769178768cf970839a9c22aba1f5b572e (diff) | |
| download | emacs-75cdf429179c6459c10f15578fb32236a8821e4b.tar.gz emacs-75cdf429179c6459c10f15578fb32236a8821e4b.tar.bz2 emacs-75cdf429179c6459c10f15578fb32236a8821e4b.zip | |
Fix selecting SQLite database files with sql-mode (Bug#23566)
* lisp/progmodes/sql.el (sql-sqlite-login-params): Allow any name as
SQLite database file name, by default.
(sql-get-login-ext): Fixed read-file-name arguments to provide
path completion even if a database name pattern is customized and to
allow creation of new SQLite database files.
Copyright-paperwork-exempt: yes
Diffstat (limited to 'lisp/progmodes/sql.el')
| -rw-r--r-- | lisp/progmodes/sql.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index d6c9516c43e..71563486ecd 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -933,10 +933,10 @@ Starts `sql-interactive-mode' after doing some setup." :version "20.8" :group 'SQL) -(defcustom sql-sqlite-login-params '((database :file ".*\\.\\(db\\|sqlite[23]?\\)")) +(defcustom sql-sqlite-login-params '((database :file nil)) "List of login parameters needed to connect to SQLite." :type 'sql-login-params - :version "24.1" + :version "26.1" :group 'SQL) ;; Customization for MySQL @@ -2954,13 +2954,15 @@ value. (The property value is used as the PREDICATE argument to ((plist-member plist :file) (expand-file-name (read-file-name prompt - (file-name-directory last-value) default t + (file-name-directory last-value) default 'confirm (file-name-nondirectory last-value) (when (plist-get plist :file) `(lambda (f) - (string-match - (concat "\\<" ,(plist-get plist :file) "\\>") - (file-name-nondirectory f))))))) + (if (not (file-regular-p f)) + t + (string-match + (concat "\\<" ,(plist-get plist :file) "\\>") + (file-name-nondirectory f)))))))) ((plist-member plist :completion) (completing-read prompt-def (plist-get plist :completion) nil t |