projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9622: * sql/conditions.lisp: Fix printing of closed-database error
[clsql.git]
/
sql
/
syntax.lisp
diff --git
a/sql/syntax.lisp
b/sql/syntax.lisp
index e4bf1507324dcbe1c4f73894110a76578803dd54..514f410438ede39fb8f33c09c37c435b2a60832c 100644
(file)
--- a/
sql/syntax.lisp
+++ b/
sql/syntax.lisp
@@
-89,7
+89,7
@@
reader syntax is disabled."
(declare (ignore char))
(let ((sqllist (read-delimited-list #\] stream t)))
(cond ((string= (write-to-string (car sqllist)) "||")
(declare (ignore char))
(let ((sqllist (read-delimited-list #\] stream t)))
(cond ((string= (write-to-string (car sqllist)) "||")
- (cons (sql-operator 'concat) (cdr sqllist)))
+ (cons (sql-operator 'concat
-op
) (cdr sqllist)))
((and (= (length sqllist) 1) (eql (car sqllist) '*))
(apply #'generate-sql-reference sqllist))
((sql-operator (car sqllist))
((and (= (length sqllist) 1) (eql (car sqllist) '*))
(apply #'generate-sql-reference sqllist))
((sql-operator (car sqllist))
@@
-161,8
+161,8
@@
and ALIAS; TABLE; and STRING."
represented by the symbol OPERATION."
(typecase operation
(string nil)
represented by the symbol OPERATION."
(typecase operation
(string nil)
- (symbol (gethash (symbol-name-default-case (symbol-name operation))
-
*sql-op-table*
))))
+ (symbol (
values (
gethash (symbol-name-default-case (symbol-name operation))
+
*sql-op-table*)
))))
(defun sql-operation (operation &rest rest)
"Returns an SQL expression constructed from the supplied SQL
(defun sql-operation (operation &rest rest)
"Returns an SQL expression constructed from the supplied SQL
@@
-172,6
+172,8
@@
REST is taken to be a valid SQL function and the remaining values
in REST its arguments."
(if (sql-operator operation)
(apply (symbol-function (sql-operator operation)) rest)
in REST its arguments."
(if (sql-operator operation)
(apply (symbol-function (sql-operator operation)) rest)
- (error "~A is not a recognized SQL operator." operation)))
+ (error 'sql-user-error
+ :message
+ (format nil "~A is not a recognized SQL operator." operation))))