;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; ======================================================================
-;;;; File: package.lisp
-;;;; Author: Marcus Pearce <m.t.pearce@city.ac.uk>, Kevin Rosenberg
-;;;; Created: 30/03/2004
-;;;; Updated: <04/04/2004 12:21:50 marcusp>
-;;;; ======================================================================
+;;;; *************************************************************************
;;;;
-;;;; Description ==========================================================
-;;;; ======================================================================
+;;;; $Id$
;;;;
-;;;; Package definitions for CLSQL-USQL.
+;;;; Package definitions for CLSQL.
;;;;
-;;;; ======================================================================
+;;;; This file is part of CLSQL.
+;;;;
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
+;;;; *************************************************************************
(in-package #:cl-user)
#+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
#:status ; database xx
#:with-database
#:with-default-database
-
+
+ ;; pool.lisp
+ #:disconnect-pooled
+
;; basic-sql.lisp
#:query
#:execute-command
:database-attribute-type
.
- ;; Shared exports for re-export by USQL.
+ ;; Shared exports for re-export by CLSQL.
;; I = Implemented, D = Documented
;; name file ID
;;====================================================
.
#1#
))
- (:documentation "This is the INTERNAL SQL-Interface package of USQL."))
+ (:documentation "This is the INTERNAL SQL-Interface package of CLSQL."))
;; see http://thread.gmane.org/gmane.lisp.lispworks.general/681
(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."))
+ (:documentation "This is the SQL-Interface package of CLSQL."))
;; 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