ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved readability in sql commands

This commit is contained in:
ndwarshuis 2018-12-29 00:23:54 -05:00
parent 990dfebdc1
commit ef33ae9393
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.org
View File

@ -2688,7 +2688,7 @@ These are =org-mode=-agnostic functions that pertain to sql. They are basically
"Execute string SQL on database DB executing `sql-sqlite-program'. "Execute string SQL on database DB executing `sql-sqlite-program'.
Returns the output of CMD. SQL should not contain any quotes as if it Returns the output of CMD. SQL should not contain any quotes as if it
were entered on the shell." were entered on the shell."
(shell-command-to-string (concat sql-sqlite-program " " db " \"" sql "\""))) (shell-command-to-string (format "%s %s \"%s\"" sql-sqlite-program db sql)))
(defun nd/sql-escape-text (txt) (defun nd/sql-escape-text (txt)
"Escape and quote TXT in order to insert into sqlite db via 'insert'. "Escape and quote TXT in order to insert into sqlite db via 'insert'.
@ -2717,8 +2717,8 @@ any other symbols to their symbol name."
(col-values (-slice tbl-data 1 nil 2)) (col-values (-slice tbl-data 1 nil 2))
(col-values (mapcar #'nd/sql-to-string col-values)) (col-values (mapcar #'nd/sql-to-string col-values))
(col-values (string-join col-values ","))) (col-values (string-join col-values ",")))
(concat "insert into " (symbol-name tbl-name) (format "insert into %s (%s) values (%s);" (symbol-name tbl-name)
" (" col-names ") values (" col-values ");"))) col-names col-values )))
(defun nd/sql-construct-insert-transaction (all-data) (defun nd/sql-construct-insert-transaction (all-data)
"Construct transaction string to insert ALL-DATA into SQL. "Construct transaction string to insert ALL-DATA into SQL.
@ -2733,7 +2733,7 @@ Does not actually execute the string."
data))))) data)))))
(ins (mapcar (lambda (tbl) (funcall scan-tbl tbl)) all-data)) (ins (mapcar (lambda (tbl) (funcall scan-tbl tbl)) all-data))
(ins (string-join ins))) (ins (string-join ins)))
(concat "begin transaction;" ins "commit;"))) (format "begin transaction; %s commit;" ins)))
(defun nd/sql-insert (db tbl-name tbl-data) (defun nd/sql-insert (db tbl-name tbl-data)
"Insert list TBL-DATA into TBL-NAME in sqlite database DB." "Insert list TBL-DATA into TBL-NAME in sqlite database DB."