r9233: fix loop

diff --git a/TODO b/TODO
index 4a25b42f9f8fded6dbf4335e30f7c189b946ec0f..e7885ada35855a768e667e452532f153a80cd364 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,9 +1,3 @@
-GENERAL 
-
-* port Oracle backend to UFFI.
-* consider adding large object support to mysql and odbc
-* add support for prepared statements. 
-
 TESTS TO ADD
 
 * CACHE-TABLE-QUERIES
@@ -13,6 +7,12 @@ TESTS TO ADD
 * Test bigint type
 * :db-constraint tests
 
+POSSIBLE EXTENSIONS
+
+* port Oracle backend to UFFI
+* large object support 
+* add support for prepared statements
+
 COMMONSQL SPEC
 
 * Missing: 

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index 526bafd863c6684af279afa42f9294b052b7c7eb..4fc421bb56452ecf71af888c32997faed4e64472 100644 (file)
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -55,10 +55,10 @@
 
     (cond
       ;; Object query resulting in a list of returned object instances
-      ((and (consp (first in-phrase))
-           (string-equal "select" (symbol-name (caar in-phrase)))
-           (eq 'quote (first (second (first in-phrase))))
-           (symbolp (second (second (first in-phrase)))))
+     ((and (consp (first in-phrase))
+          (consp (second (first in-phrase)))
+          (eq 'quote (first (second (first in-phrase))))
+          (symbolp (second (second (first in-phrase)))))
 
        (let ((result-var (ansi-loop::loop-gentemp
                              'loop-record-result-))

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 7e875b26d8f182adcee256ca699364e15b79aa48..d6cd8fe9f7cbf6d94fc563fc252219efb467b9ae 100644 (file)
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -289,8 +289,8 @@
 
 (deftest :oodml/iteration/3
     (loop for (e) being the records in 
-          (select 'employee :where [married] :order-by [emplid])
-     collect (slot-value e 'last-name))
+          [select 'employee :where [married] :order-by [emplid]]
+       collect (slot-value e 'last-name))
   ("Lenin" "Stalin" "Trotsky"))
 
 ))