r10077: * multiple: Apply patch from Joerg Hoehle with multiple

[clsql.git] / db-oracle / oracle-objects.lisp

diff --git a/db-oracle/oracle-objects.lisp b/db-oracle/oracle-objects.lisp
index a5583ee4ea6c142dfa318541add6833af6f3973b..ea9c15b6336a13b9917820711bc0b3c8eda41483 100644 (file)
--- a/db-oracle/oracle-objects.lisp
+++ b/db-oracle/oracle-objects.lisp
@@ -17,7 +17,7 @@
 
 (defmethod database-get-type-specifier (type args database (db-type (eql :oracle)))
   (declare (ignore type args database))
-    (format nil "VARCHAR2(~D)" *default-varchar-length*))
+    (format nil "VARCHAR2(~D)" *default-string-length*))
 
 (defmethod database-get-type-specifier ((type (eql 'integer)) args 
                                        database (db-type (eql :oracle)))
@@ -42,14 +42,14 @@
   (declare (ignore database)) 
   (if args
       (format nil "CHAR(~A)" (car args))
-    (format nil "VARCHAR2(~D)" *default-varchar-length*)))
+    (format nil "VARCHAR2(~D)" *default-string-length*)))
 
 (defmethod database-get-type-specifier ((type (eql 'varchar)) args
                                        database (db-type (eql :oracle)))
   (declare (ignore database)) 
   (if args
       (format nil "VARCHAR2(~A)" (car args))
-    (format nil "VARCHAR2(~D)" *default-varchar-length*)))
+    (format nil "VARCHAR2(~D)" *default-string-length*)))
 
 (defmethod database-get-type-specifier ((type (eql 'float)) args
                                        database (db-type (eql :oracle)))
@@ -71,6 +71,11 @@
   (declare (ignore args database))
   "CHAR(1)")
 
+(defmethod database-get-type-specifier ((type (eql 'generalized-boolean)) args
+                                       database (db-type (eql :oracle)))
+  (declare (ignore args database))
+  "CHAR(1)")
+
 (defmethod read-sql-value (val type
                           database (db-type (eql :oracle)))
   ;;(format t "value is \"~A\" of type ~A~%" val (type-of val))
@@ -97,6 +102,12 @@
   (when (char-equal #\t (schar val 0))
     t))
 
+(defmethod read-sql-value (val (type (eql 'generalized-boolean))
+                          database (db-type (eql :oracle)))
+  (declare (ignore database))
+  (when (char-equal #\t (schar val 0))
+    t))
+
 (defmethod read-sql-value (val (type (eql 'bigint))
                           database (db-type (eql :oracle)))
   (declare (ignore database))