From b7db3eab456003e502a3a82b4bfdad154a82054d Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 16 Feb 2021 15:45:32 -0700 Subject: [PATCH] Fix compilation --- parse-common.lisp | 14 ++++++++++++++ sql-classes.lisp | 14 -------------- sql.lisp | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/parse-common.lisp b/parse-common.lisp index b139566..f7fab1e 100644 --- a/parse-common.lisp +++ b/parse-common.lisp @@ -378,3 +378,17 @@ append a unique number (starting at 2) onto a column name that is repeated in th (defun escape-column-name (name) (substitute #\_ #\/ name)) + +;; SQLNAME is required for collision of SQL reserved words (MYSQL 8: RANK) +;; and column names in UMLS (RANK in MRRANK) +(defvar *sql-reserved-names* '("RANK")) +(defmethod sqlname ((c ucol)) + (sqlname (col c))) +(defmethod sqlname ((name string)) + (if (find name *sql-reserved-names* :test #'string-equal) + (concatenate 'string "_" name) + name)) +(defmethod sqlname ((l list)) + (mapcar #'sqlname l)) +(defmethod sqlname ((s symbol)) + (sqlname (symbol-name s))) diff --git a/sql-classes.lisp b/sql-classes.lisp index 2b468dc..d086fd4 100644 --- a/sql-classes.lisp +++ b/sql-classes.lisp @@ -23,20 +23,6 @@ (defun set-current-srl (srl) (setq *current-srl* srl)) -;; SQLNAME is required for collision of SQL reserved words (MYSQL 8: RANK) -;; and column names in UMLS (RANK in MRRANK) -(defvar *sql-reserved-names* '("RANK")) -(defmethod sqlname ((c ucol)) - (sqlname (col c))) -(defmethod sqlname ((name string)) - (if (find name *sql-reserved-names* :test #'string-equal) - (concatenate 'string "_" name) - name)) -(defmethod sqlname ((l list)) - (mapcar #'sqlname l)) -(defmethod sqlname ((s symbol)) - (sqlname (symbol-name s))) - (defmacro query-string (table fields srl where-name where-value &key (lrl "KCUILRL") single distinct order like limit filter) diff --git a/sql.lisp b/sql.lisp index 7c6cc2c..b98d0a2 100644 --- a/sql.lisp +++ b/sql.lisp @@ -41,21 +41,21 @@ (keyword (setq *umls-sql-db* (lookup-db-name db))))) -(defvar *umls-sql-user* "umls") +(defvar *umls-sql-user* "mts") (defun umls-sql-user () *umls-sql-user*) (defun set-umls-sql-user (u) (sql-disconnect-pooled) (setq *umls-sql-user* u)) -(defvar *umls-sql-passwd* "umls") +(defvar *umls-sql-passwd* "_mts") (defun umls-sql-passwd () *umls-sql-passwd*) (defun set-umls-sql-passwd (p) (sql-disconnect-pooled) (setq *umls-sql-passwd* p)) -(defvar *umls-sql-host* "localhost") +(defvar *umls-sql-host* "sql1.med-info.com") (defun umls-sql-host () *umls-sql-host*) (defun set-umls-sql-host (h) -- 2.34.1