;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(in-package #:clsql)
+(in-package #:clsql-sys)
(eval-when (:compile-toplevel :load-toplevel :execute)
(when (>= (length (generic-function-lambda-list
:accessor view-class-qualifier
:initarg :qualifier
:initform nil))
- (:documentation "VIEW-CLASS metaclass."))
+ (:documentation "Metaclass for all CLSQL View Classes."))
;;; Lispworks 4.2 and before requires special processing of extra slot and class options
((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 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)
- (let ((type (slot-value slot 'type)))
+ (let ((type (slot-definition-type slot)))
(if (eq type t)
(setq type nil))
(list (slot-value slot 'name)
: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
- "Value to store is the SQL value is NULL. Default is NIL.")
+ "Value to store if the SQL value is NULL. Default is NIL.")
(db-info
:accessor view-class-slot-db-info
:initarg :db-info
(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
(defun compute-class-precedence-list (class)
(class-precedence-list class))))
-#-(or sbcl cmu)
+#-mop-slot-order-reversed
(defmethod compute-slots ((class standard-db-class))
"Need to sort order of class slots so they are the same across
implementations."
((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)
+ ((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))
(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))
+(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)
(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
;; 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))