;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;;
-;;;; $Id: $
+;;;; $Id$
;;;;
;;;; The CLSQL Object Oriented Data Manipulation Language (OODML).
;;;;
(error "No view-table for class ~A" classname))
(sql-expression :table (view-table class))))
+
+(defparameter *default-varchar-length* 255)
+
(defmethod database-get-type-specifier (type args database db-type)
(declare (ignore type args database db-type))
- "VARCHAR(255)")
+ (format nil "VARCHAR(~D)" *default-varchar-length*))
(defmethod database-get-type-specifier ((type (eql 'integer)) args database db-type)
(declare (ignore database db-type))
(defmethod database-get-type-specifier ((type (eql 'bigint)) args database db-type)
(declare (ignore args database db-type))
"BIGINT")
-
-(defmethod database-get-type-specifier ((type (eql 'simple-base-string)) args
- database db-type)
- (declare (ignore database db-type))
- (if args
- (format nil "VARCHAR(~A)" (car args))
- "VARCHAR(255)"))
-(defmethod database-get-type-specifier ((type (eql 'simple-string)) args
+(deftype varchar ()
+ "A variable length string for the SQL varchar type."
+ 'string)
+
+(defmethod database-get-type-specifier ((type (eql 'varchar)) args
database db-type)
(declare (ignore database db-type))
(if args
(format nil "VARCHAR(~A)" (car args))
- "VARCHAR(255)"))
+ (format nil "VARCHAR(~D)" *default-varchar-length*)))
(defmethod database-get-type-specifier ((type (eql 'string)) args database db-type)
(declare (ignore database db-type))
(if args
- (format nil "VARCHAR(~A)" (car args))
- "VARCHAR(255)"))
+ (format nil "CHAR(~A)" (car args))
+ (format nil "VARCHAR(~D)" *default-varchar-length*)))
(deftype universal-time ()
"A positive integer as returned by GET-UNIVERSAL-TIME."
(declare (ignore database args db-type))
"INT8")
-(deftype raw-string (&optional len)
- "A string which is not trimmed when retrieved from the database"
+#+ignore
+(deftype char (&optional len)
+ "A lisp type for the SQL CHAR type."
`(string ,len))
-(defmethod database-get-type-specifier ((type (eql 'raw-string)) args database db-type)
- (declare (ignore database db-type))
- (if args
- (format nil "VARCHAR(~A)" (car args))
- "VARCHAR"))
-
(defmethod database-get-type-specifier ((type (eql 'float)) args database db-type)
(declare (ignore database db-type))
(if args
(declare (ignore args database db-type))
"BOOL")
+(defmethod database-get-type-specifier ((type (eql 'number)) args database db-type)
+ (declare (ignore database db-type))
+ (cond
+ ((and (consp args) (= (length args) 2))
+ (format nil "NUMBER(~D,~D)" (first args) (second args)))
+ ((and (consp args) (= (length args) 1))
+ (format nil "NUMBER(~D)" (first args)))
+ (t
+ "NUMBER")))
+
+(defmethod database-get-type-specifier ((type (eql 'char)) args database db-type)
+ (declare (ignore database db-type))
+ (if args
+ (format nil "CHAR(~D)" (first args))
+ "CHAR(1)"))
+
+
(defmethod database-output-sql-as-type (type val database db-type)
(declare (ignore type database db-type))
val)
(declare (ignore database db-type))
val)
-(defmethod database-output-sql-as-type ((type (eql 'simple-string))
- val database db-type)
- (declare (ignore database db-type))
- val)
-
-(defmethod database-output-sql-as-type ((type (eql 'simple-base-string))
+(defmethod database-output-sql-as-type ((type (eql 'char))
val database db-type)
(declare (ignore database db-type))
- val)
+ (etypecase val
+ (character (write-to-string val))
+ (string val)))
(defmethod read-sql-value (val type database db-type)
(declare (ignore type database db-type))
(declare (ignore database db-type))
val)
-(defmethod read-sql-value (val (type (eql 'simple-string)) database db-type)
- (declare (ignore database db-type))
- val)
-
-(defmethod read-sql-value (val (type (eql 'simple-base-string)) database db-type)
+(defmethod read-sql-value (val (type (eql 'varchar)) database db-type)
(declare (ignore database db-type))
val)
-(defmethod read-sql-value (val (type (eql 'raw-string)) database db-type)
+(defmethod read-sql-value (val (type (eql 'char)) database db-type)
(declare (ignore database db-type))
- val)
-
+ (schar val 0))
+
(defmethod read-sql-value (val (type (eql 'keyword)) database db-type)
(declare (ignore database db-type))
(when (< 0 (length val))
(declare (ignore database db-type))
(equal "t" val))
-(defmethod read-sql-value (val (type (eql 'univeral-time)) database db-type)
+(defmethod read-sql-value (val (type (eql 'number)) database db-type)
+ (declare (ignore database db-type))
+ (etypecase val
+ (string
+ (unless (string-equal "NIL" val)
+ (read-from-string val)))
+ (number val)))
+
+(defmethod read-sql-value (val (type (eql 'universal-time)) database db-type)
(declare (ignore database db-type))
(unless (eq 'NULL val)
(etypecase val
(record-caches database)) results)
results)
-(defun update-cached-results (targets qualifiers database)
- ;; FIXME: this routine will need to update slots in cached objects, perhaps adding or removing objects from cached
- ;; for now, dump cache entry and perform fresh search
- (let ((res (apply #'find-all targets qualifiers)))
- (setf (gethash (compute-records-cache-key targets qualifiers)
- (record-caches database)) res)
- res))