X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-oracle%2Foracle-objects.lisp;h=9cebea18adec007e6c454604d7ffc36fa9e8a773;hp=5f2651593a5b63fc867433439a63f2a3d6d3e624;hb=e7a214b2445830219022acb5911a3f9303d938bd;hpb=815bc95a91ee2324f4e28a5be4793e4f58e86c06

diff --git a/db-oracle/oracle-objects.lisp b/db-oracle/oracle-objects.lisp
index 5f26515..9cebea1 100644
--- a/db-oracle/oracle-objects.lisp
+++ b/db-oracle/oracle-objects.lisp
@@ -15,11 +15,9 @@
 
 (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-varchar-length*))
 
 (defmethod database-get-type-specifier ((type (eql 'integer)) args 
 					database (db-type (eql :oracle)))
@@ -37,40 +35,26 @@
 	      (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* ")")))
-
-(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 '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* ")")))
+      (format nil "CHAR(~A)" (car args))
+    (format nil "VARCHAR2(~D)" *default-varchar-length*)))
 
-(defmethod database-get-type-specifier ((type (eql 'raw-string)) args
+(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-varchar-length*)))
 
 (defmethod database-get-type-specifier ((type (eql 'float)) args
 					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)))
@@ -78,7 +62,7 @@
   (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 'boolean)) args
 					database (db-type (eql :oracle)))