X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fusql.cl;h=1141dc0e1f33847f896b005f857c0866a3f1dd7d;hb=1292822d0591897376e572152d3cbd6de9bee827;hp=a22b108c12d184688138846d84b038832448e1aa;hpb=b4f641e256405778029888b10727095ce35055e0;p=clsql.git diff --git a/sql/usql.cl b/sql/usql.cl index a22b108..1141dc0 100644 --- a/sql/usql.cl +++ b/sql/usql.cl @@ -8,7 +8,7 @@ ;;;; Programmers: Kevin M. Rosenberg and onShore Development Inc ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: usql.cl,v 1.3 2002/04/06 19:54:15 kevin Exp $ +;;;; $Id: usql.cl,v 1.11 2002/09/17 17:16:43 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and onShore Development Inc @@ -45,48 +45,6 @@ keyword argument :database specifies the database to query, defaulting to *default-database*." (database-attribute-type attribute table database)) -(defun add-attribute (table attribute &key (database *default-database*)) - "Add the ATTRIBUTE to TABLE. The ATTRIBUTE sepcification must -include a type argument. The optional keyword argument :database -specifies the database to operation on, defaulting to -*default-database*." - (database-add-attribute table attribute database)) - -(defun rename-attribute (table oldatt newname - &key (database *default-database*)) - (error "(rename-attribute ~a ~a ~a ~a) is not implemented" table oldatt newname database)) - - -;; For SQL Identifiers of generic type -(defclass sql-ident (%sql-expression) - ((name - :initarg :name - :initform "NULL")) - (:documentation "An SQL identifer.")) - -(defmethod make-load-form ((sql sql-ident) &optional environment) - (declare (ignore environment)) - (with-slots (name) - sql - `(make-instance 'sql-ident :name ',name))) - - -;; KMR -- change aref to more specific char -(defun sql-escape (identifier) - (let* ((unescaped (etypecase identifier - (symbol (symbol-name identifier)) - (string identifier))) - (escaped (make-string (length unescaped)))) - (dotimes (i (length unescaped)) - (setf (char escaped i) - (cond ((equal (char unescaped i) #\-) - #\_) - ;; ... - (t - (char unescaped i))))) - escaped)) - - (defun create-sequence (name &key (database *default-database*)) (database-create-sequence name database)) @@ -96,38 +54,4 @@ specifies the database to operation on, defaulting to (defun sequence-next (name &key (database *default-database*)) (database-sequence-next name database)) -(defclass sql-typecast-exp (sql-value-exp) - () - (:documentation - "An SQL typecast expression.") - ) - -(defclass sql-value-exp (%sql-expression) - ((modifier - :initarg :modifier - :initform nil) - (components - :initarg :components - :initform nil)) - (:documentation - "An SQL value expression.") - ) - -(defvar +null-string+ "NULL") - -(defvar *sql-stream* nil - "stream which accumulates SQL output") - -(defclass %sql-expression () - ()) - -(defmethod output-sql ((expr %sql-expression) &optional - (database *default-database*)) - (declare (ignore database)) - (write-string +null-string+ *sql-stream*)) - -(defmethod print-object ((self %sql-expression) stream) - (print-unreadable-object - (self stream :type t) - (write-string (sql-output self) stream)))