projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9449: * db-odbc/odbc-sql.lisp, db-aodbc/aodbc-sql.lisp: Move common code to
[clsql.git]
/
tests
/
test-fdml.lisp
diff --git
a/tests/test-fdml.lisp
b/tests/test-fdml.lisp
index adbb8479c90b52820e92ace8d6d409b61f4e6b41..b2d4e3ed47f57ed2aaed2ebdb104bf789ffd1990 100644
(file)
--- a/
tests/test-fdml.lisp
+++ b/
tests/test-fdml.lisp
@@
-1,7
+1,7
@@
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
;;;; File: test-fdml.lisp
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
;;;; File: test-fdml.lisp
-;;;; Author: Marcus Pearce <m.t.pearce@city.ac.uk>
+;;;; Author: Marcus Pearce <m.t.pearce@city.ac.uk>
, Kevin Rosenberg
;;;; Created: 30/03/2004
;;;; Updated: $Id$
;;;;
;;;; Created: 30/03/2004
;;;; Updated: $Id$
;;;;
@@
-375,10
+375,11
@@
"Yuri"))
(deftest :fdml/select/25
"Yuri"))
(deftest :fdml/select/25
- (clsql:select [first-name] :from "employee" :flatp t :distinct t
- :field-names nil
- :result-types nil
- :order-by [first-name])
+ (clsql:select [first-name] :from (clsql-sys:convert-to-db-default-case "employee" *default-database*)
+ :flatp t :distinct t
+ :field-names nil
+ :result-types nil
+ :order-by [first-name])
("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir"
"Yuri"))
("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir"
"Yuri"))
@@
-447,6
+448,15
@@
("Andropov" "Brezhnev" "Chernenko" "Gorbachev" "Kruschev" "Putin" "Stalin"
"Trotsky" "Yeltsin"))
("Andropov" "Brezhnev" "Chernenko" "Gorbachev" "Kruschev" "Putin" "Stalin"
"Trotsky" "Yeltsin"))
+(deftest :fdml/select/34
+ (loop for x from 1 below 5
+ collect
+ (car
+ (clsql:select [last-name] :from [employee]
+ :where [= [emplid] x]
+ :flatp t :result-types nil :field-names nil)))
+ ("Lenin" "Stalin" "Trotsky" "Kruschev"))
+
(deftest :fdml/do-query/1
(let ((result '()))
(clsql:do-query ((name) [select [last-name] :from [employee]
(deftest :fdml/do-query/1
(let ((result '()))
(clsql:do-query ((name) [select [last-name] :from [employee]
@@
-615,7
+625,7
@@
:av-pairs
'((emale "lenin-nospam@soviet.org"))
:where [= [emplid] 1]))
:av-pairs
'((emale "lenin-nospam@soviet.org"))
:where [= [emplid] 1]))
- (clsql:
clsql
-error ()
+ (clsql:
sql-database
-error ()
(progn
;; check status
(push (clsql:in-transaction-p) results)
(progn
;; check status
(push (clsql:in-transaction-p) results)