projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9423: fix case of test names
[clsql.git]
/
sql
/
sql.lisp
diff --git
a/sql/sql.lisp
b/sql/sql.lisp
index 6bc454724621bf4adbbc76ddfdbae63caff5b9a3..c80723b24dd8a5b7b1d2622c1e0b5fbee258191e 100644
(file)
--- a/
sql/sql.lisp
+++ b/
sql/sql.lisp
@@
-48,6
+48,8
@@
(signal-no-database-error database))
(unless (is-database-open database)
(database-reconnect database))
(signal-no-database-error database))
(unless (is-database-open database)
(database-reconnect database))
+ (when (eq :oracle (database-type database))
+ (ignore-errors (execute-command "PURGE RECYCLEBIN" :database database)))
(when (db-type-has-views? (database-underlying-type database))
(dolist (view (list-views :database database))
(drop-view view :database database)))
(when (db-type-has-views? (database-underlying-type database))
(dolist (view (list-views :database database))
(drop-view view :database database)))
@@
-120,7
+122,7
@@
table INTO. The default value of DATABASE is *DEFAULT-DATABASE*."
(av-pairs nil)
(subquery nil))
(unless into
(av-pairs nil)
(subquery nil))
(unless into
- (error '
clsql-sql-syntax-error :reason
":into keyword not supplied"))
+ (error '
sql-user-error :message
":into keyword not supplied"))
(let ((insert (make-instance 'sql-insert :into into)))
(with-slots (attributes values query)
insert
(let ((insert (make-instance 'sql-insert :into into)))
(with-slots (attributes values query)
insert
@@
-138,8
+140,8
@@
table INTO. The default value of DATABASE is *DEFAULT-DATABASE*."
(setf attributes attrs)
(setf query subquery))
(t
(setf attributes attrs)
(setf query subquery))
(t
- (error '
clsql-sql-syntax
-error
- :
reason
"bad or ambiguous keyword combination.")))
+ (error '
sql-user
-error
+ :
message
"bad or ambiguous keyword combination.")))
insert)))
(defun delete-records (&key (from nil)
insert)))
(defun delete-records (&key (from nil)
@@
-243,10
+245,11
@@
condition is true."
(if (or (null thing)
(eq 'null thing))
"NULL"
(if (or (null thing)
(eq 'null thing))
"NULL"
- (error 'clsql-simple-error
- :format-control
- "No type conversion to SQL for ~A is defined for DB ~A."
- :format-arguments (list (type-of thing) (type-of database)))))
+ (error 'sql-user-error
+ :message
+ (format nil
+ "No type conversion to SQL for ~A is defined for DB ~A."
+ (type-of thing) (type-of database)))))
(defmethod output-sql-hash-key ((arg vector) database)
(defmethod output-sql-hash-key ((arg vector) database)