X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-oracle%2Foracle-objects.lisp;h=3e5a6b713e8866d828c9a062915b5c19cff7118d;hp=5f2651593a5b63fc867433439a63f2a3d6d3e624;hb=ed507b70a9d910372d1378cf0a7754fc88171183;hpb=7308bdf188da6424e615ca14096ef53cfb845a90

diff --git a/db-oracle/oracle-objects.lisp b/db-oracle/oracle-objects.lisp
index 5f26515..3e5a6b7 100644
--- a/db-oracle/oracle-objects.lisp
+++ b/db-oracle/oracle-objects.lisp
@@ -4,8 +4,6 @@
 ;;;;
 ;;;; Name: oracle-objects.lisp
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -15,78 +13,69 @@
 
 (in-package #:clsql-oracle)
 
-(defparameter *oracle-default-varchar2-length* "512")
-
 (defmethod database-get-type-specifier (type args database (db-type (eql :oracle)))
   (declare (ignore type args database))
-  (concatenate 'string "VARCHAR2(" *oracle-default-varchar2-length* ")"))
+    (format nil "VARCHAR2(~D)" *default-string-length*))
 
-(defmethod database-get-type-specifier ((type (eql 'integer)) args 
-					database (db-type (eql :oracle)))
+(defmethod database-get-type-specifier ((type (eql 'integer)) args
+                                        database (db-type (eql :oracle)))
   (declare (ignore database))
   (if args
       (format nil "NUMBER(~A,~A)"
-	      (or (first args) 38) (or (second args) 0))
+              (or (first args) 38) (or (second args) 0))
     "INTEGER"))
 
 (defmethod database-get-type-specifier ((type (eql 'bigint)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
-  (if args
-      (format nil "NUMBER(~A,~A)"
-	      (or (first args) 38) (or (second args) 0))
-    "NUMBER(38,0)"))
-
-(defmethod database-get-type-specifier ((type (eql 'simple-base-string)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
-  (if args
-      (format nil "VARCHAR2(~A)" (car args))
-    (concatenate 'string "VARCHAR2(" *oracle-default-varchar2-length* ")")))
+                                        database (db-type (eql :oracle)))
+  (declare (ignore args database))
+  "CHAR(20)")
 
-(defmethod database-get-type-specifier ((type (eql 'simple-string)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
-  (if args
-      (format nil "VARCHAR2(~A)" (car args))
-    (concatenate 'string "VARCHAR2(" *oracle-default-varchar2-length* ")")))
+(defmethod database-get-type-specifier ((type (eql 'universal-time)) args
+                                        database (db-type (eql :oracle)))
+  (declare (ignore args database))
+  "CHAR(20)")
 
 (defmethod database-get-type-specifier ((type (eql 'string)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
+                                        database (db-type (eql :oracle)))
+  (declare (ignore database))
   (if args
-      (format nil "VARCHAR2(~A)" (car args))
-    (concatenate 'string "VARCHAR2(" *oracle-default-varchar2-length* ")")))
+      (format nil "CHAR(~A)" (car args))
+    (format nil "VARCHAR2(~D)" *default-string-length*)))
 
-(defmethod database-get-type-specifier ((type (eql 'raw-string)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
+(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))
-    (concatenate 'string "VARCHAR2(" *oracle-default-varchar2-length* ")")))
+    (format nil "VARCHAR2(~D)" *default-string-length*)))
 
 (defmethod database-get-type-specifier ((type (eql 'float)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
+                                        database (db-type (eql :oracle)))
+  (declare (ignore database))
   (if args
       (format nil "NUMBER(~A,~A)" (or (first args) 38) (or (second args) 38))
-    "double precision"))
+    "DOUBLE PRECISION"))
 
 (defmethod database-get-type-specifier ((type (eql 'long-float)) args
-					database (db-type (eql :oracle)))
-  (declare (ignore database)) 
+                                        database (db-type (eql :oracle)))
+  (declare (ignore database))
   (if args
       (format nil "NUMBER(~A,~A)"
-	      (or (first args) 38) (or (second args) 38))
-    "double precision"))
+              (or (first args) 38) (or (second args) 38))
+    "DOUBLE PRECISION"))
 
 (defmethod database-get-type-specifier ((type (eql 'boolean)) args
-					database (db-type (eql :oracle)))
+                                        database (db-type (eql :oracle)))
+  (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)))
+                           database (db-type (eql :oracle)))
   ;;(format t "value is \"~A\" of type ~A~%" val (type-of val))
   (declare (ignore type database))
   (etypecase val
@@ -96,27 +85,44 @@
      nil)))
 
 (defmethod read-sql-value (val (type (eql 'integer))
-			   database (db-type (eql :oracle)))
+                           database (db-type (eql :oracle)))
   (declare (ignore database))
   val)
 
 (defmethod read-sql-value (val (type (eql 'float))
-			   database (db-type (eql :oracle)))
+                           database (db-type (eql :oracle)))
   (declare (ignore database))
   val)
 
 (defmethod read-sql-value (val (type (eql 'boolean))
-			   database (db-type (eql :oracle)))
+                           database (db-type (eql :oracle)))
+  (declare (ignore database))
+  (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))
+  (parse-integer val))
+
+(defmethod read-sql-value (val (type (eql 'universal-time))
+                           database (db-type (eql :oracle)))
+  (declare (ignore database))
+  (parse-integer val))
+
+
 (defmethod database-get-type-specifier ((type (eql 'wall-time)) args
-					database (db-type (eql :oracle)))
+                                        database (db-type (eql :oracle)))
   (declare (ignore args database))
   "DATE")
 
 (defmethod database-get-type-specifier ((type (eql 'duration)) args
-					database (db-type (eql :oracle)))
+                                        database (db-type (eql :oracle)))
   (declare (ignore args database))
   "NUMBER(38)")