Fix compilation

diff --git a/parse-common.lisp b/parse-common.lisp
index b1395665b68eb612ef4de7fcfccaa16436ce2981..f7fab1e8eb6e9dcc02bca4cfc7ae0cfc23fe81ad 100644 (file)
--- 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 2b468dc095080d61e621470005df128dbf1131b1..d086fd4969689c1ecf9424ef17616be5314510e1 100644 (file)
--- 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 7c6cc2c42c01df87469ef44b363d1a93c72ef19a..b98d0a29053c155f73f7834d1408cdb94dc30f96 100644 (file)
--- 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)