X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=blobdiff_plain;f=sql.lisp;h=d2900d6d2a8bb40231d52cac24d6cc18b08e3c19;hp=1c4b0579a413fc1d9ee6277fbc7c7546558389af;hb=f4ea91e2cf0eb22db02498e54d1f75ef5dcd4239;hpb=b9fe7fe8b8e24133538f78dbaf6af73b5f0bdec2 diff --git a/sql.lisp b/sql.lisp index 1c4b057..d2900d6 100644 --- a/sql.lisp +++ b/sql.lisp @@ -65,7 +65,7 @@ (defun sql-connect () "Connect to UMLS database, automatically used pooled connections" (clsql:connect (list *umls-sql-host* (lookup-db-name *umls-sql-db*) - *umls-sql-user* *umls-sql-passwd*) + *umls-sql-user* *umls-sql-passwd*) :database-type *umls-sql-type* :pool t)) (defun sql-disconnect (conn) @@ -81,17 +81,17 @@ (progn ,@body) (when ,conn (clsql:disconnect :database ,conn))))) -(defun sql (stmt conn) - (if (string-equal "SELECT" (subseq stmt 0 6)) - (sql-query stmt conn) - (sql-execute stmt conn))) - (defun sql-query (cmd conn &key (result-types :auto)) (clsql:query cmd :database conn :result-types result-types :field-names nil)) (defun sql-execute (cmd conn) (clsql:execute-command cmd :database conn)) +(defun sql (stmt conn) + (if (string-equal "SELECT" (subseq stmt 0 6)) + (sql-query stmt conn) + (sql-execute stmt conn))) + (defun umls-sql (stmt) (check-type stmt string) (with-sql-connection (conn)