projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10145: add patch for collect-table-refs
[clsql.git]
/
sql
/
expressions.lisp
diff --git
a/sql/expressions.lisp
b/sql/expressions.lisp
index 2f40e33a6e67f640b107a0a2dc9d444941c9287d..88293b30d360e24207e187e85c54e12bac7d99dd 100644
(file)
--- a/
sql/expressions.lisp
+++ b/
sql/expressions.lisp
@@
-67,7
+67,8
@@
(defmethod print-object ((self %sql-expression) stream)
(print-unreadable-object
(self stream :type t)
(defmethod print-object ((self %sql-expression) stream)
(print-unreadable-object
(self stream :type t)
- (write-string (sql-output self) stream)))
+ (write-string (sql-output self) stream))
+ self)
;; For straight up strings
;; For straight up strings
@@
-91,7
+92,8
@@
(defmethod print-object ((ident sql) stream)
(format stream "#<~S \"~A\">"
(type-of ident)
(defmethod print-object ((ident sql) stream)
(format stream "#<~S \"~A\">"
(type-of ident)
- (sql-output ident nil)))
+ (sql-output ident nil))
+ ident)
;; For SQL Identifiers of generic type
;; For SQL Identifiers of generic type
@@
-354,7
+356,7
@@
(defmethod collect-table-refs ((sql sql-function-exp))
(let ((tabs nil))
(defmethod collect-table-refs ((sql sql-function-exp))
(let ((tabs nil))
- (dolist (exp (slot-value sql '
component
s))
+ (dolist (exp (slot-value sql '
arg
s))
(let ((refs (collect-table-refs exp)))
(if refs (setf tabs (append refs tabs)))))
(remove-duplicates tabs
(let ((refs (collect-table-refs exp)))
(if refs (setf tabs (append refs tabs)))))
(remove-duplicates tabs
@@
-828,9
+830,9
@@
uninclusive, and the args from that keyword to the end."
;;
(defmethod database-output-sql ((str string) database)
;;
(defmethod database-output-sql ((str string) database)
- (declare (
ignore database
)
-
(optimize (speed 3) (safety 1)
#+cmu (extensions:inhibit-warnings 3))
- (
type (simple-array * (*))
str))
+ (declare (
optimize (speed 3) (safety 1
)
+
#+cmu (extensions:inhibit-warnings 3))
+ (
simple-string
str))
(let ((len (length str)))
(declare (type fixnum len))
(cond ((zerop len)
(let ((len (length str)))
(declare (type fixnum len))
(cond ((zerop len)
@@
-850,7
+852,11
@@
uninclusive, and the args from that keyword to the end."
(setf (aref buf j) #\')
(incf j)
(setf (aref buf j) #\'))
(setf (aref buf j) #\')
(incf j)
(setf (aref buf j) #\'))
- ((char= char #\\)
+ ((and (char= char #\\)
+ ;; MTP: only escape backslash with pgsql/mysql
+ (member (database-underlying-type database)
+ '(:postgresql :mysql)
+ :test #'eq))
(setf (aref buf j) #\\)
(incf j)
(setf (aref buf j) #\\))
(setf (aref buf j) #\\)
(incf j)
(setf (aref buf j) #\\))
@@
-859,11
+865,13
@@
uninclusive, and the args from that keyword to the end."
(let ((keyword-package (symbol-package :foo)))
(defmethod database-output-sql ((sym symbol) database)
(let ((keyword-package (symbol-package :foo)))
(defmethod database-output-sql ((sym symbol) database)
- (convert-to-db-default-case
- (if (equal (symbol-package sym) keyword-package)
- (concatenate 'string "'" (string sym) "'")
- (symbol-name sym))
- database)))
+ (if (null sym)
+ +null-string+
+ (convert-to-db-default-case
+ (if (equal (symbol-package sym) keyword-package)
+ (concatenate 'string "'" (string sym) "'")
+ (symbol-name sym))
+ database))))
(defmethod database-output-sql ((tee (eql t)) database)
(declare (ignore database))
(defmethod database-output-sql ((tee (eql t)) database)
(declare (ignore database))