projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9510: * db-sqlite: Remove clisp support since clisp can not run CLSQL
[clsql.git]
/
sql
/
operations.lisp
diff --git
a/sql/operations.lisp
b/sql/operations.lisp
index bc99d2a136eaf02297f8747a9c8e9eb250178393..ad785b35ffc28b36e41bf41a070b88333e0abe81 100644
(file)
--- a/
sql/operations.lisp
+++ b/
sql/operations.lisp
@@
-147,7
+147,7
@@
(if (= (length rest) 3)
(make-instance 'sql-function-exp
:name 'substring :args rest)
(if (= (length rest) 3)
(make-instance 'sql-function-exp
:name 'substring :args rest)
- (error '
clsql-sql-syntax-error
"SUBSTR must have 3 arguments.")))
+ (error '
sql-user-error :message
"SUBSTR must have 3 arguments.")))
(defsql sql-is (:symbol "is") (&rest rest)
(make-instance 'sql-relational-exp
(defsql sql-is (:symbol "is") (&rest rest)
(make-instance 'sql-relational-exp
@@
-213,7
+213,7
@@
(defsql sql-between (:symbol "between") (&rest rest)
(if (= (length rest) 3)
(make-instance 'sql-between-exp :name 'between :args rest)
(defsql sql-between (:symbol "between") (&rest rest)
(if (= (length rest) 3)
(make-instance 'sql-between-exp :name 'between :args rest)
- (error '
clsql-sql-syntax-error
"BETWEEN must have 3 arguments.")))
+ (error '
sql-user-error :message
"BETWEEN must have 3 arguments.")))
(defsql sql-distinct (:symbol "distinct") (&rest rest)
(make-instance 'sql-query-modifier-exp :modifier 'distinct
(defsql sql-distinct (:symbol "distinct") (&rest rest)
(make-instance 'sql-query-modifier-exp :modifier 'distinct
@@
-226,3
+226,7
@@
(defsql sql-nvl (:symbol "nvl") (&rest rest)
(make-instance 'sql-function-exp
:name 'coalesce :args rest))
(defsql sql-nvl (:symbol "nvl") (&rest rest)
(make-instance 'sql-function-exp
:name 'coalesce :args rest))
+
+(defsql sql-userenv (:symbol "userenv") (&rest rest)
+ (make-instance 'sql-function-exp
+ :name 'userenv :args rest))