X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=sql%2Foodml.lisp;h=174b35a95f375d43465f20082c57c6ae1d87ba92;hb=c4e1422d93b72c1ab1be5c913c48860b1f4e39e2;hp=d701f0906e3a2352cbf01262c8b4179f6b02990a;hpb=bb71f27c241187a32c7839aea501114d65e29f85;p=clsql.git

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index d701f09..174b35a 100644
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -315,7 +315,23 @@
   (declare (ignore database db-type))
   (if args
       (format nil "INT(~A)" (car args))
-      "INT"))
+    "INT"))
+
+(deftype tinyint () 
+  "An 8-bit integer, this width may vary by SQL implementation."
+  'integer)
+
+(defmethod database-get-type-specifier ((type (eql 'tinyint)) args database db-type)
+  (declare (ignore args database db-type))
+  "INT")
+
+(deftype smallint () 
+  "An integer smaller than a 32-bit integer, this width may vary by SQL implementation."
+  'integer)
+
+(defmethod database-get-type-specifier ((type (eql 'smallint)) args database db-type)
+  (declare (ignore args database db-type))
+  "INT")
 
 (deftype bigint () 
   "An integer larger than a 32-bit integer, this width may vary by SQL implementation."
@@ -499,6 +515,14 @@
        (parse-integer val)))
     (number val)))
 
+(defmethod read-sql-value (val (type (eql 'smallint)) database db-type)
+  (declare (ignore database db-type))
+  (etypecase val
+    (string
+     (unless (string-equal "NIL" val)
+       (parse-integer val)))
+    (number val)))
+
 (defmethod read-sql-value (val (type (eql 'bigint)) database db-type)
   (declare (ignore database db-type))
   (etypecase val
@@ -1073,7 +1097,8 @@ as elements of a list."
   (unless (record-caches database)
     (setf (record-caches database)
 	  (make-hash-table :test 'equal
-			   #+allegro :values #+allegro :weak)))
+			   #+allegro :values #+allegro :weak
+                           #+lispworks :weak-kind #+lispworks :value)))
   (setf (gethash (compute-records-cache-key targets qualifiers)
 		 (record-caches database)) results)
   results)