X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fmetaclasses.lisp;h=a43c4acd836381ab77f928401c542aa191717e02;hp=f981c900be363b18be8e67cd8db6895e800d465e;hb=e7a214b2445830219022acb5911a3f9303d938bd;hpb=5953db07cc2276392d0a81052d2d8c71d3252b5a

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index f981c90..a43c4ac 100644
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -12,7 +12,7 @@
 ;;;; (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
@@ -362,7 +362,7 @@ column definition in the database.")
    (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."
@@ -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)) "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))
@@ -497,6 +507,7 @@ 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)))
+	   #-openmcl (declare (ignore type-predicate))
 	   (change-class esd 'view-class-effective-slot-definition
 			 #+allegro :name 
 			 #+allegro (slot-definition-name dsd))