From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Rolf Ade Newsgroups: gmane.emacs.bugs Subject: bug#23566: sql-sqlite: selecting database file is crippled) Date: Wed, 04 Jan 2017 00:42:56 +0100 Message-ID: <87fukzsoan.fsf@pointsman.de> References: <87posko3km.fsf@linux-qg7d.i-did-not-set--mail-host-address--so-tickle-me> <57900512.2070007@pointsman.de> <87r34n321o.fsf@pointsman.de> <87pok777gk.fsf@users.sourceforge.net> <87k2adro4d.fsf@pointsman.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1483487280 22565 195.159.176.226 (3 Jan 2017 23:48:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 3 Jan 2017 23:48:00 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: 23566@debbugs.gnu.org To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 04 00:47:56 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOYny-0004Kz-8w for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 Jan 2017 00:47:46 +0100 Original-Received: from localhost ([::1]:36602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOYo2-00048u-Cf for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Jan 2017 18:47:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOYhX-0006OC-Hn for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2017 18:41:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOYhS-0003n2-M0 for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2017 18:41:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53491) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cOYhS-0003mV-Iy for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2017 18:41:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cOYhS-00063k-7B for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2017 18:41:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Rolf Ade Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 03 Jan 2017 23:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23566 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 23566-submit@debbugs.gnu.org id=B23566.148348683323248 (code B ref 23566); Tue, 03 Jan 2017 23:41:02 +0000 Original-Received: (at 23566) by debbugs.gnu.org; 3 Jan 2017 23:40:33 +0000 Original-Received: from localhost ([127.0.0.1]:40657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOYgy-00062u-TK for submit@debbugs.gnu.org; Tue, 03 Jan 2017 18:40:33 -0500 Original-Received: from mxout3.interscholz.de ([85.236.196.238]:52820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOYgw-00062i-Vx for 23566@debbugs.gnu.org; Tue, 03 Jan 2017 18:40:31 -0500 Original-Received: from localhost (mxout3 [127.0.0.1]) by mxout3.interscholz.de (Postfix) with ESMTP id E5E41214C0; Wed, 4 Jan 2017 00:40:24 +0100 (CET) X-Virus-Scanned: interscholz amavisd-new at mxout3.interscholz.de Original-Received: from server.web01.interscholz.net (server.web01.interscholz.net [85.236.196.138]) by mxout3.interscholz.de (Postfix) with ESMTP id 44AB8205DA; Wed, 4 Jan 2017 00:40:24 +0100 (CET) Original-Received: from point (x5f70a0c9.dyn.telefonica.de [95.112.160.201]) by server.web01.interscholz.net (Postfix) with ESMTPSA id 9A54B3401BD; Wed, 4 Jan 2017 00:40:23 +0100 (CET) In-Reply-To: <87k2adro4d.fsf@pointsman.de> (Rolf Ade's message of "Tue, 03 Jan 2017 01:19:46 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:127722 Archived-At: Rolf Ade writes: > [...] > diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el > index d6c9516..55ba320 100644 > --- a/lisp/progmodes/sql.el > +++ b/lisp/progmodes/sql.el > @@ -933,10 +933,10 @@ sql-sqlite-options > :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 > @@ -2958,9 +2958,11 @@ sql-get-login-ext > (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 Sorry for any confusion - due to new years holidays I'm not on my main box and I missed in my last patch the part "allow creation of new SQLite database files". Commit message: 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 diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index d6c9516..7156348 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -933,10 +933,10 @@ sql-sqlite-options :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 @@ sql-get-login-ext ((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