X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Foodml.lisp;h=fb76c55743fe7ff464377d42c08ac5958ec5dae6;hb=c58d03408390451aeb6887d78b391684ecc8f691;hp=cc57941e38e2520e80e48cad4ab50fa42b4c9b11;hpb=5ed1f05543cbd24b3f2bb735f2cfc03ea85e51ec;p=clsql.git diff --git a/sql/oodml.lisp b/sql/oodml.lisp index cc57941..fb76c55 100644 --- a/sql/oodml.lisp +++ b/sql/oodml.lisp @@ -1097,13 +1097,18 @@ as elements of a list." (order-by-list (copy-seq (listify order-by)))) (loop for i from 0 below (length order-by-list) - do (etypecase (nth i order-by-list) + do (typecase (nth i order-by-list) (sql-ident-attribute - (unless (slot-value (nth i order-by-list) 'qualifier) - (setf (slot-value (nth i order-by-list) 'qualifier) table-name))) + (handler-case + (unless (slot-value (nth i order-by-list) 'qualifier) + (setf (slot-value (nth i order-by-list) 'qualifier) table-name)) + (simple-error ()))) (cons - (unless (slot-value (car (nth i order-by-list)) 'qualifier) - (setf (slot-value (car (nth i order-by-list)) 'qualifier) table-name))))) + (handler-case + (unless (slot-value (car (nth i order-by-list)) 'qualifier) + (setf (slot-value (car (nth i order-by-list)) 'qualifier) table-name)) + (simple-error ()))) + (clsql-sys:sql-function-exp))) (setf (getf qualifier-args :order-by) order-by-list))) (cond