;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
-;;;; File: classes.lisp
-;;;; Updated: <04/04/2004 12:08:49 marcusp>
+;;;; $Id: $
;;;; ======================================================================
;;;;
;;;; Description ==========================================================
;;;;
;;;; ======================================================================
-(in-package #:clsql-usql-sys)
+(in-package #:clsql-sys)
(defvar +empty-string+ "''")
;;; re-exports into CLSQL-USQL-SYS them to hide differences in
;;; MOP implementations.
-(in-package #:clsql-usql-sys)
+(in-package #:clsql-sys)
#+lispworks
(defun intern-eql-specializer (slot)
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
-;;;; File: metaclasses.lisp
-;;;; Updated: <04/04/2004 12:08:11 marcusp>
+;;;; $Id: $
;;;; ======================================================================
;;;;
;;;; Description ==========================================================
;;;; ======================================================================
-(in-package #:clsql-usql-sys)
+(in-package #:clsql-sys)
(eval-when (:compile-toplevel :load-toplevel :execute)
(when (>= (length (generic-function-lambda-list
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
-;;;; File: objects.lisp
-;;;; Updated: <04/04/2004 12:07:55 marcusp>
-;;;; ======================================================================
+;;;; $Id: $
;;;;
;;;; Description ==========================================================
;;;; ======================================================================
;;;;
;;;; ======================================================================
-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)
(defclass standard-db-object ()
((view-database
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
-;;;; File: operations.lisp
-;;;; Updated: <04/04/2004 12:07:26 marcusp>
+;;;; $Id: $
;;;; ======================================================================
;;;;
;;;; Description ==========================================================
;;;;
;;;; ======================================================================
-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)
;; Keep a hashtable for mapping symbols to sql generator functions,
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; ======================================================================
;;;; File: package.lisp
-;;;; Author: Marcus Pearce <m.t.pearce@city.ac.uk>, Kevin Rosenberg
+;;;; Authors: Marcus Pearce <m.t.pearce@city.ac.uk> and Kevin Rosenberg
;;;; Created: 30/03/2004
-;;;; Updated: <04/04/2004 12:21:50 marcusp>
+;;;; Updated: $Id: $
;;;; ======================================================================
;;;;
;;;; Description ==========================================================
#+sbcl
(if (find-package 'sb-mop)
- (pushnew :usql-sbcl-mop cl:*features*)
- (pushnew :usql-sbcl-pcl cl:*features*))
+ (pushnew :clsql-sbcl-mop cl:*features*)
+ (pushnew :clsql-sbcl-pcl cl:*features*))
#+cmu
(if (eq (symbol-package 'pcl:find-class)
(find-package 'common-lisp))
- (pushnew :usql-cmucl-mop cl:*features*)
- (pushnew :usql-cmucl-pcl cl:*features*)))
+ (pushnew :clsql-cmucl-mop cl:*features*)
+ (pushnew :clsql-cmucl-pcl cl:*features*)))
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defpackage #:clsql-usql-sys
- (:nicknames #:usql-sys)
+ (defpackage #:clsql-sys
(:use #:common-lisp #:clsql-base-sys
- #+usql-sbcl-mop #:sb-mop
- #+usql-cmucl-mop #:mop
+ #+clsql-sbcl-mop #:sb-mop
+ #+clsql-cmucl-mop #:mop
#+allegro #:mop
#+lispworks #:clos
#+scl #:clos
#+lispworks
(:shadowing-import-from
#:clos)
- #+usql-sbcl-mop
+ #+clsql-sbcl-mop
(:shadowing-import-from
#:sb-pcl
#:generic-function-lambda-list)
- #+usql-sbcl-pcl
+ #+clsql-sbcl-pcl
(:shadowing-import-from
#:sb-pcl
#:name
#:make-method-lambda #:generic-function-lambda-list
#:class-precedence-list #:slot-definition-type
#:class-direct-superclasses)
- #+usql-cmucl-mop
+ #+clsql-cmucl-mop
(:shadowing-import-from
#:pcl
#:generic-function-lambda-list)
- #+usql-cmucl-pcl
+ #+clsql-cmucl-pcl
(:shadowing-import-from
#:pcl
#:class-direct-slots
(setf *packages-for-warn-on-redefinition*
(delete "SQL" *packages-for-warn-on-redefinition* :test 'string=))
-(defpackage #:clsql-usql
- (:nicknames #:usql #:sql)
- (:use :common-lisp)
- (:import-from :clsql-usql-sys . #2#)
+(defpackage #:clsql
+ (:use #:common-lisp)
+ (:import-from :clsql-sys . #2#)
(:export . #2#)
(:documentation "This is the SQL-Interface package of USQL."))
;; This is from USQL's pcl-patch
- #+(or usql-sbcl-pcl usql-cmucl-pcl)
+ #+(or clsql-sbcl-pcl clsql-cmucl-pcl)
(progn
;; Note that this will no longer required for cmucl as of version 19a.
(in-package #+cmu :pcl #+sbcl :sb-pcl)
#+sbcl
(if (find-package 'sb-mop)
- (setq cl:*features* (delete :usql-sbcl-mop cl:*features*))
- (setq cl:*features* (delete :usql-sbcl-pcl cl:*features*)))
+ (setq cl:*features* (delete :clsql-sbcl-mop cl:*features*))
+ (setq cl:*features* (delete :clsql-sbcl-pcl cl:*features*)))
#+cmu
(if (find-package 'mop)
- (setq cl:*features* (delete :usql-cmucl-mop cl:*features*))
- (setq cl:*features* (delete :usql-cmucl-pcl cl:*features*)))
+ (setq cl:*features* (delete :clsql-cmucl-mop cl:*features*))
+ (setq cl:*features* (delete :clsql-cmucl-pcl cl:*features*)))
);eval-when
;;;;
;;;; ======================================================================
-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)
;;; Basic operations on databases
;;;;
;;;; ======================================================================
-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)
(defvar *original-reader-enter* nil)
;;;;
;;;; ======================================================================
-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)
;; Utilities
(defun sequence-last (name &key (database *default-database*))
"Return the last value of the sequence NAME in DATABASE."
- (database-sequence-last (database-identifier name) database))
\ No newline at end of file
+ (database-sequence-last (database-identifier name) database))