projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid errors if 32-bit build fails on 64-bit system
[clsql.git]
/
sql
/
oodml.lisp
diff --git
a/sql/oodml.lisp
b/sql/oodml.lisp
index 9bd2ab66dea8f5db6b74f2665ea31092b2ebe899..f797be0b02b36d611021bdffa4e9d3afc9477fea 100644
(file)
--- a/
sql/oodml.lisp
+++ b/
sql/oodml.lisp
@@
-495,8
+495,10
@@
(defmethod database-output-sql-as-type ((type (eql 'float)) val database db-type)
(declare (ignore database db-type))
(defmethod database-output-sql-as-type ((type (eql 'float)) val database db-type)
(declare (ignore database db-type))
- (let ((*read-default-float-format* (type-of val)))
- (format nil "~F" val)))
+ (if (eq (type-of val) 'null)
+ nil
+ (let ((*read-default-float-format* (type-of val)))
+ (format nil "~F" val))))
(defmethod read-sql-value (val type database db-type)
(declare (ignore type database db-type))
(defmethod read-sql-value (val type database db-type)
(declare (ignore type database db-type))
@@
-949,7
+951,6
@@
maximum of MAX-LEN instances updated in each query."
(listify order-by)))
(join-where nil))
(listify order-by)))
(join-where nil))
-
;;(format t "sclasses: ~W~%ijc: ~W~%tables: ~W~%" sclasses immediate-join-classes tables)
(dolist (ob order-by-slots)
;;(format t "sclasses: ~W~%ijc: ~W~%tables: ~W~%" sclasses immediate-join-classes tables)
(dolist (ob order-by-slots)
@@
-1094,7
+1095,7
@@
as elements of a list."
;; one selected table. This is required so FIND-ALL won't duplicate
;; the field
(when (and order-by (= 1 (length target-args)))
;; one selected table. This is required so FIND-ALL won't duplicate
;; the field
(when (and order-by (= 1 (length target-args)))
- (let ((table-name
(view-table (find-class (car target-args))))
+ (let ((table-name (view-table (find-class (car target-args))))
(order-by-list (copy-seq (listify order-by))))
(loop for i from 0 below (length order-by-list)
(order-by-list (copy-seq (listify order-by))))
(loop for i from 0 below (length order-by-list)