@@ -548,13 +548,6 @@ no longer needed while the session stays open."
548548 (sql-password (cdr (assoc :dbpassword params)))
549549 (buffer-name (format " %s " (if (string= session " none" ) " "
550550 (format " [%s ] " session))))
551- ; ; (buffer-name
552- ; ; (format "%s%s://%s%s/%s"
553- ; ; (if (string= session "none") "" (format "[%s] " session))
554- ; ; engine
555- ; ; (if sql-user (concat sql-user "@") "")
556- ; ; (if sql-server (concat sql-server ":") "")
557- ; ; sql-database))
558551 (ob-sql-buffer (format " *SQL: %s * " buffer-name)))
559552
560553 (if (org-babel-comint-buffer-livep ob-sql-buffer)
@@ -570,12 +563,6 @@ no longer needed while the session stays open."
570563 (unless sql-term-proc
571564 (user-error (format " SQL %s didn't start " in-engine)))
572565
573- ; ; clear the welcoming message out of the output from the
574- ; ; first command, in the case where we forgot quiet mode.
575- ; ; we can't evaluate how long the connection will take
576- ; ; so if quiet mode is off and the connexion takes time
577- ; ; then the welcoming message may show up
578-
579566 (with-current-buffer (get-buffer ob-sql-buffer)
580567 (let ((preamble (plist-get org-sql-session-preamble in-engine)))
581568 (when preamble
@@ -630,14 +617,6 @@ should also be prompted."
630617 (sql-get-product-feature engine :sqli-login )))
631618 ; ; depending on client, password is forcefully prompted
632619
633- ; ; Connect to database.
634- ; ; (let ((sql-user (default-value 'sql-user))
635- ; ; (sql-password (default-value 'sql-password))
636- ; ; (sql-server (default-value 'sql-server))
637- ; ; (sql-database (default-value 'sql-database))
638- ; ; (sql-port (default-value 'sql-port))
639- ; ; (default-directory (or sql-default-directory default-directory)))
640-
641620 ; ; The password wallet returns a function
642621 ; ; which supplies the password. (untested)
643622 (when (functionp sql-password)
@@ -688,7 +667,7 @@ should also be prompted."
688667
689668(defun org-sql-session-format-query (str in-engine )
690669 " Process then send the command STR to the SQL process.
691- Provide ENGINE to retrieve product features.
670+ Provide IN- ENGINE to retrieve product features.
692671Carefully separate client commands from SQL commands
693672Concatenate SQL commands as one line is one way to stop on error.
694673Otherwise the entire batch will be emitted no matter what.
0 commit comments