From a194659ff405bed6fc42651d907f5ba76999bce3 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 23 May 2004 17:46:23 +0000 Subject: [PATCH] r9454: * test/test-fdml.lisp: Accomodate that Oracle returns doubles for computed columns --- ChangeLog | 5 +- db-oracle/oracle-sql.lisp | 4 +- debian/changelog | 6 +++ tests/test-fdml.lisp | 97 ++++++++++++++++++++++++--------------- 4 files changed, 71 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14f2635..b454968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 23 May 2004 Kevin Rosenberg + * Version 2.10.22 released * sql/kmr-mop.lisp, sql/objects.lisp: Since SBCL is the only implementation that has reversed class slots, change the default for ordered-class-slots so that slots are now in the same order an in the def-view-class. @@ -7,7 +8,8 @@ * db-oracle/oracle-sql.lisp: Add missing database qualifier. Return NUMBER (double) for computed fields, this will require some adjustment to the test suite which in many cases expects integers. - + * test/test-fdml.lisp: Accomodate that Oracle returns doubles for computed columns + 22 May 2004 Kevin Rosenberg * Version 2.10.21 released * sql/sequences.lisp: Move generic sequence functions here from db-sqlite, @@ -29,7 +31,6 @@ * test/test-fdml.lisp: String table names are now case sensitive, so convert to default db case for FDML/SELECT/25 ->>>>>>> .r9445 22 May 2004 Kevin Rosenberg * Version 2.10.20 released: Oracle backend now fails 6 out of 200 tests * TODO: Added 2 variances from CommonSQL. Add tests for owner phrases diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp index b4402db..574c1e6 100644 --- a/db-oracle/oracle-sql.lisp +++ b/db-oracle/oracle-sql.lisp @@ -930,6 +930,7 @@ the length of that format.") ) database :auto nil))) +;; FIXME: use lock (defmethod database-set-sequence-position (name position (database oracle-database)) (let* ((next (database-sequence-next name database)) (incr (- position next))) @@ -1022,7 +1023,8 @@ the length of that format.") list))) (defmethod clsql-sys:database-start-transaction ((database oracle-database)) - (call-next-method)) + (call-next-method) + ) ;;(with-slots (svchp errhp) database ;; (osucc (oci-trans-start (uffi:deref-pointer svchp) diff --git a/debian/changelog b/debian/changelog index 0bf4e12..d88451f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.10.22-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Sun, 23 May 2004 11:46:00 -0600 + cl-sql (2.10.21-1) unstable; urgency=low * New upstream diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp index b2d4e3e..bf57c13 100644 --- a/tests/test-fdml.lisp +++ b/tests/test-fdml.lisp @@ -133,7 +133,7 @@ (let ((count (caar (clsql:query "SELECT COUNT(*) FROM EMPLOYEE WHERE (EMAIL LIKE '%org')" :field-names nil)))) (if (stringp count) (nth-value 0 (parse-integer count)) - count)) + (nth-value 0 (truncate count)))) 10) (deftest :fdml/query/2 @@ -155,29 +155,38 @@ t) (deftest :fdml/query/5 - (clsql:query (clsql:sql [select [first-name] [sum [emplid]] :from [employee]] - [group-by [first-name]] [order-by [sum [emplid]]]) - :field-names nil :result-types nil) - (("Josef" "2") ("Leon" "3") ("Nikita" "4") ("Leonid" "5") ("Yuri" "6") - ("Konstantin" "7") ("Mikhail" "8") ("Boris" "9") ("Vladamir" "11"))) + (let ((res (clsql:query (clsql:sql [select [first-name] [sum [emplid]] :from [employee]] + [group-by [first-name]] [order-by [sum [emplid]]]) + :field-names nil :result-types nil))) + (mapcar (lambda (p) (list (car p) (truncate (read-from-string (second p))))) + res)) + (("Josef" 2) ("Leon" 3) ("Nikita" 4) ("Leonid" 5) ("Yuri" 6) + ("Konstantin" 7) ("Mikhail" 8) ("Boris" 9) ("Vladamir" 11))) (deftest :fdml/query/6 - (clsql:query (clsql:sql [union [select [emplid] :from [employee]] - [select [groupid] :from [company]]]) - :field-names nil :result-types nil :flatp t) - ("1" "2" "3" "4" "5" "6" "7" "8" "9" "10")) + (let ((res (clsql:query (clsql:sql [union [select [emplid] :from [employee]] + [select [groupid] :from [company]]]) + :field-names nil :result-types nil :flatp t))) + (values (every #'stringp res) + (mapcar #'(lambda (f) (truncate (read-from-string f))) res))) + t (1 2 3 4 5 6 7 8 9 10)) (deftest :fdml/query/7 - (clsql:query (clsql:sql [intersect [select [emplid] :from [employee]] - [select [groupid] :from [company]]]) - :field-names nil :result-types nil :flatp t) - ("1")) + (let ((res (car (clsql:query (clsql:sql [intersect [select [emplid] :from [employee]] + [select [groupid] :from [company]]]) + :field-names nil :result-types nil :flatp t)))) + (values (stringp res) + (nth-value 0 (truncate (read-from-string res))))) + t 1) (deftest :fdml/query/8 - (clsql:query (clsql:sql [except [select [emplid] :from [employee]] - [select [groupid] :from [company]]]) - :field-names nil :result-types nil :flatp t) - ("2" "3" "4" "5" "6" "7" "8" "9" "10")) + (let ((res (clsql:query (clsql:sql [except [select [emplid] :from [employee]] + [select [groupid] :from [company]]]) + :field-names nil :result-types nil :flatp t))) + (values (every #'stringp res) + (mapcar #'(lambda (f) (truncate (read-from-string f))) res))) + t (2 3 4 5 6 7 8 9 10)) + (deftest :fdml/execute-command/1 (values @@ -222,13 +231,15 @@ "Yuri")) (deftest :fdml/select/3 - (clsql:select [first-name] [count [*]] :from [employee] - :result-types nil - :group-by [first-name] - :order-by [first-name] - :field-names nil) - (("Boris" "1") ("Josef" "1") ("Konstantin" "1") ("Leon" "1") ("Leonid" "1") - ("Mikhail" "1") ("Nikita" "1") ("Vladamir" "2") ("Yuri" "1"))) + (let ((res (clsql:select [first-name] [count [*]] :from [employee] + :result-types nil + :group-by [first-name] + :order-by [first-name] + :field-names nil))) + (mapcar (lambda (p) (list (car p) (truncate (read-from-string (second p))))) + res)) + (("Boris" 1) ("Josef" 1) ("Konstantin" 1) ("Leon" 1) ("Leonid" 1) + ("Mikhail" 1) ("Nikita" 1) ("Vladamir" 2) ("Yuri" 1))) (deftest :fdml/select/4 (clsql:select [last-name] :from [employee] @@ -260,14 +271,20 @@ (1 1 1 1 1 1 1 1 1 1)) (deftest :fdml/select/7 - (clsql:select [max [emplid]] :from [employee] :flatp t - :field-names nil :result-types nil) - ("10")) + (let ((result (car (clsql:select [max [emplid]] :from [employee] :flatp t + :field-names nil :result-types nil)))) + (values + (stringp result) + (nth-value 0 (truncate (read-from-string result))))) + t 10) (deftest :fdml/select/8 - (clsql:select [min [emplid]] :from [employee] :flatp t - :field-names nil :result-types nil) - ("1")) + (let ((result (car (clsql:select [min [emplid]] :from [employee] :flatp t + :field-names nil :result-types nil)))) + (values + (stringp result) + (nth-value 0 (truncate (read-from-string result))))) + t 1) (deftest :fdml/select/9 (subseq @@ -395,15 +412,19 @@ (("Vladamir" "Lenin") ("Vladamir" "Putin"))) (deftest :fdml/select/27 - (clsql:select [coalesce [managerid] 10] :from [employee] :order-by [emplid] - :field-names nil :result-types nil :flatp t) - ("10" "1" "1" "1" "1" "1" "1" "1" "1" "1")) + (mapcar + (lambda (f) (truncate (read-from-string f))) + (clsql:select [coalesce [managerid] 10] :from [employee] :order-by [emplid] + :field-names nil :result-types nil :flatp t)) + (10 1 1 1 1 1 1 1 1 1)) (deftest :fdml/select/28 - (loop for column in `([*] [emplid]) collect - (clsql:select [count column] :from [employee] - :flatp t :result-types nil :field-names nil)) - (("10") ("10"))) + (mapcar + (lambda (f) (truncate (read-from-string (car f)))) + (loop for column in `([*] [emplid]) collect + (clsql:select [count column] :from [employee] + :flatp t :result-types nil :field-names nil))) + (10 10)) (deftest :fdml/select/29 (clsql:select [first-name] [last-name] :from [employee] -- 2.34.1