projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10802: Automated commit for Debian build of clsql upstream-version-3.3.4
[clsql.git]
/
sql
/
metaclasses.lisp
diff --git
a/sql/metaclasses.lisp
b/sql/metaclasses.lisp
index 5d47ce972af8d1fa811c443ec7cf058474aef55b..332c5c058a7712ad5fd980e98c749bdf952c54f6 100644
(file)
--- a/
sql/metaclasses.lisp
+++ b/
sql/metaclasses.lisp
@@
-52,7
+52,7
@@
:accessor view-class-qualifier
:initarg :qualifier
:initform nil))
:accessor view-class-qualifier
:initarg :qualifier
:initform nil))
- (:documentation "
VIEW-CLASS metaclas
s."))
+ (:documentation "
Metaclass for all CLSQL View Classe
s."))
;;; Lispworks 4.2 and before requires special processing of extra slot and class options
;;; Lispworks 4.2 and before requires special processing of extra slot and class options
@@
-78,7
+78,7
@@
((typep arg 'sql-ident)
(slot-value arg 'name))
((stringp arg)
((typep arg 'sql-ident)
(slot-value arg 'name))
((stringp arg)
- (intern
(symbol-name-default-case arg)
))))
+ (intern
arg
))))
(defun column-name-from-arg (arg)
(cond ((symbolp arg)
(defun column-name-from-arg (arg)
(cond ((symbolp arg)
@@
-167,9
+167,9
@@
(defun describe-db-layout (class)
(flet ((not-db-col (col)
(defun describe-db-layout (class)
(flet ((not-db-col (col)
- (not (member (nth 2 col)
'(nil :base :key))))
+ (not (member (nth 2 col) '(nil :base :key))))
(frob-slot (slot)
(frob-slot (slot)
- (let ((type (slot-
value slot 'type
)))
+ (let ((type (slot-
definition-type slot
)))
(if (eq type t)
(setq type nil))
(list (slot-value slot 'name)
(if (eq type t)
(setq type nil))
(list (slot-value slot 'name)
@@
-281,13
+281,13
@@
column definition in the database.")
:initarg :db-constraints
:initform nil
:documentation
:initarg :db-constraints
:initform nil
:documentation
- "A
single constraint or list of constraints for this column
")
+ "A
keyword symbol representing a single SQL column constraint or list of such symbols.
")
(void-value
:accessor view-class-slot-void-value
:initarg :void-value
:initform nil
:documentation
(void-value
:accessor view-class-slot-void-value
:initarg :void-value
:initform nil
:documentation
- "Value to store i
s
the SQL value is NULL. Default is NIL.")
+ "Value to store i
f
the SQL value is NULL. Default is NIL.")
(db-info
:accessor view-class-slot-db-info
:initarg :db-info
(db-info
:accessor view-class-slot-db-info
:initarg :db-info
@@
-309,7
+309,7
@@
column definition in the database.")
(defun parse-db-info (db-info-list)
(destructuring-bind
(&key join-class home-key key-join foreign-key (delete-rule nil)
(defun parse-db-info (db-info-list)
(destructuring-bind
(&key join-class home-key key-join foreign-key (delete-rule nil)
- (target-slot nil) (retrieval :deferred) (set
nil
))
+ (target-slot nil) (retrieval :deferred) (set
t
))
db-info-list
(let ((ih (make-hash-table :size 6)))
(if join-class
db-info-list
(let ((ih (make-hash-table :size 6)))
(if join-class
@@
-392,10
+392,20
@@
which does type checking before storing a value in a slot."
((and (symbolp (car specified-type))
(string-equal (symbol-name (car specified-type)) "string"))
'string)
((and (symbolp (car specified-type))
(string-equal (symbol-name (car specified-type)) "string"))
'string)
+ ((and (symbolp (car specified-type))
+ (string-equal (symbol-name (car specified-type)) "varchar"))
+ 'string)
+ ((and (symbolp (car specified-type))
+ (string-equal (symbol-name (car specified-type)) "char"))
+ 'string)
(t
specified-type)))
((eq (ensure-keyword specified-type) :bigint)
'integer)
(t
specified-type)))
((eq (ensure-keyword specified-type) :bigint)
'integer)
+ ((eq (ensure-keyword specified-type) :char)
+ 'character)
+ ((eq (ensure-keyword specified-type) :varchar)
+ 'string)
((and specified-type
(not (eql :not-null (slot-value slotd 'db-constraints))))
`(or null ,specified-type))
((and specified-type
(not (eql :not-null (slot-value slotd 'db-constraints))))
`(or null ,specified-type))
@@
-413,13
+423,15
@@
which does type checking before storing a value in a slot."
(car list)
list))
(car list)
list))
-(declaim (inline delistify))
+(declaim (inline delistify
-dsd
))
(defun delistify-dsd (list)
"Some MOPs, like openmcl 0.14.2, cons attribute values in a list."
(if (and (listp list) (null (cdr list)))
(car list)
list))
(defun delistify-dsd (list)
"Some MOPs, like openmcl 0.14.2, cons attribute values in a list."
(if (and (listp list) (null (cdr list)))
(car list)
list))
+(defvar *impl-type-attrib-name* #-clisp 'type #+clisp 'clos::$type)
+
(defmethod compute-effective-slot-definition ((class standard-db-class)
#+kmr-normal-cesd slot-name
direct-slots)
(defmethod compute-effective-slot-definition ((class standard-db-class)
#+kmr-normal-cesd slot-name
direct-slots)
@@
-432,9
+444,10
@@
which does type checking before storing a value in a slot."
(null (specified-type dsd)))
(setf (specified-type dsd)
(slot-definition-type dsd))
(null (specified-type dsd)))
(setf (specified-type dsd)
(slot-definition-type dsd))
- (setf (slot-value dsd 'type)
- (compute-lisp-type-from-slot-specification
- dsd (slot-definition-type dsd))))
+ (setf #-clisp (slot-value dsd 'type)
+ #+clisp (slot-definition-type dsd)
+ (compute-lisp-type-from-slot-specification
+ dsd (slot-definition-type dsd))))
(let ((esd (call-next-method)))
(typecase dsd
(let ((esd (call-next-method)))
(typecase dsd
@@
-466,6
+479,9
@@
which does type checking before storing a value in a slot."
(delistify-dsd (view-class-slot-db-kind dsd))
:base))
(delistify-dsd (view-class-slot-db-kind dsd))
:base))
+ (setf (slot-value esd 'db-reader)
+ (when (slot-boundp dsd 'db-reader)
+ (delistify-dsd (view-class-slot-db-reader dsd))))
(setf (slot-value esd 'db-writer)
(when (slot-boundp dsd 'db-writer)
(delistify-dsd (view-class-slot-db-writer dsd))))
(setf (slot-value esd 'db-writer)
(when (slot-boundp dsd 'db-writer)
(delistify-dsd (view-class-slot-db-writer dsd))))
@@
-497,9
+513,10
@@
which does type checking before storing a value in a slot."
;; all other slots
(t
(let ((type-predicate #+openmcl (slot-value esd 'ccl::type-predicate)))
;; all other slots
(t
(let ((type-predicate #+openmcl (slot-value esd 'ccl::type-predicate)))
- (change-class esd 'view-class-effective-slot-definition
- #+allegro :name
- #+allegro (slot-definition-name dsd))
+ #-openmcl (declare (ignore type-predicate))
+ #-clisp (change-class esd 'view-class-effective-slot-definition
+ #+allegro :name
+ #+allegro (slot-definition-name dsd))
#+openmcl (setf (slot-value esd 'ccl::type-predicate)
type-predicate))
#+openmcl (setf (slot-value esd 'ccl::type-predicate)
type-predicate))