projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r8857: package renaming
[clsql.git]
/
sql
/
objects.lisp
diff --git
a/sql/objects.lisp
b/sql/objects.lisp
index 14bb76f8ddd3eb2f09e019d23191dfc7253f756b..1991b70c151f6e9b86f2781dc7ccf29ee3fde70b 100644
(file)
--- a/
sql/objects.lisp
+++ b/
sql/objects.lisp
@@
-1,18
+1,16
@@
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
-;;;; File: objects.lisp
-;;;; Updated: <04/04/2004 12:07:55 marcusp>
-;;;; ======================================================================
+;;;; $Id: $
;;;;
;;;; Description ==========================================================
;;;; ======================================================================
;;;;
;;;;
;;;; Description ==========================================================
;;;; ======================================================================
;;;;
-;;;; The CLSQL
-USQL
Object Oriented Data Definitional Language (OODDL)
+;;;; The CLSQL Object Oriented Data Definitional Language (OODDL)
;;;; and Object Oriented Data Manipulation Language (OODML).
;;;;
;;;; ======================================================================
;;;; and Object Oriented Data Manipulation Language (OODML).
;;;;
;;;; ======================================================================
-(in-package
:clsql-u
sql-sys)
+(in-package
#:cl
sql-sys)
(defclass standard-db-object ()
((view-database
(defclass standard-db-object ()
((view-database
@@
-20,7
+18,7
@@
:initarg :view-database
:db-kind :virtual))
(:metaclass standard-db-class)
:initarg :view-database
:db-kind :virtual))
(:metaclass standard-db-class)
- (:documentation "Superclass for all CLSQL
-USQL
View Classes."))
+ (:documentation "Superclass for all CLSQL View Classes."))
(defmethod view-database ((self standard-db-object))
(slot-value self 'view-database))
(defmethod view-database ((self standard-db-object))
(slot-value self 'view-database))
@@
-102,8
+100,8
@@
#.(locally-enable-sql-reader-syntax)
(defun ensure-schema-version-table (database)
#.(locally-enable-sql-reader-syntax)
(defun ensure-schema-version-table (database)
- (unless (table-exists-p "
u
sql_object_v" :database database)
- (create-table [
u
sql_object_v] '(([name] (string 32))
+ (unless (table-exists-p "
cl
sql_object_v" :database database)
+ (create-table [
cl
sql_object_v] '(([name] (string 32))
([vers] integer)
([def] (string 32)))
:database database)))
([vers] integer)
([def] (string 32)))
:database database)))
@@
-117,10
+115,10
@@
slotdef database)))
(when res (setf schemadef (cons res schemadef)))))
(when schemadef
slotdef database)))
(when res (setf schemadef (cons res schemadef)))))
(when schemadef
- (delete-records :from [
u
sql_object_v]
+ (delete-records :from [
cl
sql_object_v]
:where [= [name] (sql-escape (class-name tclass))]
:database database)
:where [= [name] (sql-escape (class-name tclass))]
:database database)
- (insert-records :into [
u
sql_object_v]
+ (insert-records :into [
cl
sql_object_v]
:av-pairs `(([name] ,(sql-escape (class-name tclass)))
([vers] ,(car (object-version tclass)))
([def] ,(prin1-to-string
:av-pairs `(([name] ,(sql-escape (class-name tclass)))
([vers] ,(car (object-version tclass)))
([def] ,(prin1-to-string
@@
-171,7
+169,7
@@
which defines that view. The argument DATABASE has a default value of
(if tclass
(let ((*default-database* database))
(%uninstall-class tclass)
(if tclass
(let ((*default-database* database))
(%uninstall-class tclass)
- (delete-records :from [
u
sql_object_v]
+ (delete-records :from [
cl
sql_object_v]
:where [= [name] (sql-escape view-class-name)]))
(error "Class ~s not found." view-class-name)))
(values))
:where [= [name] (sql-escape view-class-name)]))
(error "Class ~s not found." view-class-name)))
(values))
@@
-298,9
+296,9
@@
superclass of the newly-defined View Class."
(defun slot-type (slotdef)
(let ((slot-type (slot-definition-type slotdef)))
(if (listp slot-type)
(defun slot-type (slotdef)
(let ((slot-type (slot-definition-type slotdef)))
(if (listp slot-type)
- (cons (find-symbol (symbol-name (car slot-type)) :
u
sql-sys)
+ (cons (find-symbol (symbol-name (car slot-type)) :
cl
sql-sys)
(cdr slot-type))
(cdr slot-type))
- (find-symbol (symbol-name slot-type) :
u
sql-sys))))
+ (find-symbol (symbol-name slot-type) :
cl
sql-sys))))
(defmethod update-slot-from-db ((instance standard-db-object) slotdef value)
(declare (optimize (speed 3) #+cmu (extensions:inhibit-warnings 3)))
(defmethod update-slot-from-db ((instance standard-db-object) slotdef value)
(declare (optimize (speed 3) #+cmu (extensions:inhibit-warnings 3)))