From 357dad37300c0f2cc45156dae18bd89265c20431 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 16 Sep 2006 14:32:30 +0000 Subject: [PATCH] r11164: fix case in tests --- sql-classes.lisp | 22 +++++++++++----------- tests/basic.lisp | 34 +++++++++++++++++----------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sql-classes.lisp b/sql-classes.lisp index 594103f..f6f306e 100644 --- a/sql-classes.lisp +++ b/sql-classes.lisp @@ -35,7 +35,7 @@ "")) (%%lrl (format nil " AND ~:@(~A~)<=" lrl)) (%%where (when where-name - (format nil " where ~:@(~A~)~A" where-name + (format nil " WHERE ~:@(~A~)~A" where-name (if like " like " "")))) (%filter (gensym "FILTER-")) (%single (gensym "SINGLE-")) @@ -55,7 +55,7 @@ (number (concatenate 'string "='" (write-to-string ,where-value) "'")) (null - " is null") + " IS NULL") (t (format nil ,(if like "'%~A%'" "='~A'") ,where-value))))) (if ,%filter (concatenate 'string @@ -78,22 +78,22 @@ (when single (setq limit 1)) (concatenate 'string - (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)" - (if distinct "distinct " "") fields table) - (if where-name (format nil " where ~:@(~A~)" where-name) "") + (format nil "SELECT ~A~{~:@(~A~)~^,~} FROM ~:@(~A~)" + (if distinct "DISTINCT " "") fields table) + (if where-name (format nil " WHERE ~:@(~A~)" where-name) "") (if where-name (format nil (typecase where-value (number "='~D'") - (null " is null") + (null " IS NULL") (t - (if like " like '%~A%""='~A'"))) + (if like " LINK '%~A%""='~A'"))) where-value) "") (if filter (concatenate 'string " AND " filter) nil) - (if srl (format nil " and ~:@(~A~)<=~D" lrl srl) "") - (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "") - (if limit (format nil " limit ~D" limit) ""))) + (if srl (format nil " AND ~:@(~A~)<=~D" lrl srl) "") + (if order (format nil " ORDER BY ~{~:@(~A~) ~(~A~)~^,~}" order) "") + (if limit (format nil " LIMIT ~D" limit) ""))) (defmacro umlisp-query (table fields srl where-name where-value @@ -604,7 +604,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (ensure-cui-integer cui) (ensure-lui-integer lui) (ensure-sui-integer sui) - (let ((ls "select CODE,ATN,SAB,ATV from MRSAT where ")) + (let ((ls "SELECT CODE,ATN,SAB,ATV FROM MRSAT WHERE ")) (cond (sui (string-append ls "KCUISUI='" (integer-string (make-cuisui cui sui) 14) diff --git a/tests/basic.lisp b/tests/basic.lisp index 2cfae73..65b219f 100644 --- a/tests/basic.lisp +++ b/tests/basic.lisp @@ -12,7 +12,7 @@ ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. ;;;; -;;;; UMLisp users are granted the rights to distribute and use this software +;;;; UMLisp users are granted the rights to distribute AND use this software ;;;; as governed by the terms of the GNU General Public License. ;;;; ************************************************************************* @@ -21,54 +21,54 @@ (setq *rt-basic* '( (deftest :qrystr/1 (umlisp::query-string mrcon (cui lui)) - "select CUI,LUI from MRCON") + "SELECT CUI,LUI FROM MRCON") (deftest :qrystr/1e (umlisp::query-string-eval 'mrcon '(cui lui)) - "select CUI,LUI from MRCON") + "SELECT CUI,LUI FROM MRCON") (deftest :qrystr/2 (umlisp::query-string mrcon (cui lui) 0) - "select CUI,LUI from MRCON and KCUILRL<=0") + "SELECT CUI,LUI FROM MRCON AND KCUILRL<=0") (deftest :qrystr/2e (umlisp::query-string-eval 'mrcon '(cui lui) 0) - "select CUI,LUI from MRCON and KCUILRL<=0") + "SELECT CUI,LUI FROM MRCON AND KCUILRL<=0") (deftest :qrystr/3 (umlisp::query-string mrcon (cui lui) nil cui 5) - "select CUI,LUI from MRCON where CUI='5'") + "SELECT CUI,LUI FROM MRCON WHERE CUI='5'") (deftest :qrystr/3e (umlisp::query-string-eval 'mrcon '(cui lui) nil 'cui 5) - "select CUI,LUI from MRCON where CUI='5'") + "SELECT CUI,LUI FROM MRCON WHERE CUI='5'") (deftest :qrystr/4 (umlisp::query-string mrcon (cui lui) nil kpfstr "Abc") - "select CUI,LUI from MRCON where KPFSTR='Abc'") + "SELECT CUI,LUI FROM MRCON WHERE KPFSTR='Abc'") (deftest :qrystr/4e (umlisp::query-string-eval 'mrcon '(cui lui) nil 'kpfstr "Abc") - "select CUI,LUI from MRCON where KPFSTR='Abc'") + "SELECT CUI,LUI FROM MRCON WHERE KPFSTR='Abc'") (deftest :qrystr/5 (umlisp::query-string mrcon (cui lui) 2 cui 5 :single t) - "select CUI,LUI from MRCON where CUI='5' and KCUILRL<=2 limit 1") + "SELECT CUI,LUI FROM MRCON WHERE CUI='5' AND KCUILRL<=2 LIMIT 1") (deftest :qrystr/5e (umlisp::query-string-eval 'mrcon '(cui lui) 2 'cui 5 :single t) - "select CUI,LUI from MRCON where CUI='5' and KCUILRL<=2 limit 1") + "SELECT CUI,LUI FROM MRCON WHERE CUI='5' AND KCUILRL<=2 LIMIT 1") (deftest :qrystr/6 (umlisp::query-string mrdef (sab def) 2 cui 39 :lrl ksrl :single t) - "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 limit 1") + "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 LIMIT 1") (deftest :qrystr/6e (umlisp::query-string-eval 'mrdef '(sab def) 2 'cui 39 :lrl 'ksrl :single t) - "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 limit 1") + "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 LIMIT 1") (deftest :qrystr/7 (umlisp::query-string mrdef (sab def) 2 cui 39 :lrl ksrl :order (cui asc)) - "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 order by CUI asc") + "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc") (deftest :qrystr/7e (umlisp::query-string-eval 'mrdef '(sab def) 2 'cui 39 :lrl 'ksrl :order '(cui asc)) - "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 order by CUI asc") + "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc") (deftest :qrystr/8 (umlisp::query-string mrdef (sab def) 2 cui 39 :lrl ksrl :order (cui asc def desc)) - "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 order by CUI asc,DEF desc") + "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc,DEF desc") (deftest :qrystr/8e (umlisp::query-string-eval 'mrdef '(sab def) 2 'cui 39 :lrl 'ksrl :order '(cui asc def desc)) - "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 order by CUI asc,DEF desc") + "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND SRL<=2 ORDER BY CUI asc,DEF desc") (deftest :ui/1 (umlisp::parse-cui "C0002341") 2341) (deftest :ui/2 (umlisp::parse-lui "L0002341") 2341) -- 2.34.1