r8852: package renaming

diff --git a/sql/classes.lisp b/sql/classes.lisp
index c390c5f03e18feb77bdc3ba11459b8c149f0f59f..0babb5c57ecbcd9fa233668a22c421ce449daae1 100644 (file)
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -1,7 +1,6 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================

-;;;; File:    classes.lisp
-;;;; Updated: <04/04/2004 12:08:49 marcusp>
+;;;; $Id: $

 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================
 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================


@@ -12,7 +11,7 @@
 ;;;;
 ;;;; ======================================================================
 
 ;;;;
 ;;;; ======================================================================
 

-(in-package #:clsql-usql-sys)
+(in-package #:clsql-sys)

 
 
 (defvar +empty-string+ "''")
 
 
 (defvar +empty-string+ "''")

diff --git a/sql/kmr-mop.lisp b/sql/kmr-mop.lisp
index 32cc35db0965b93b9f8d0a00c2d92d643adb0cce..6949c12acac33230a884ef7f57ec5b89cfde07a5 100644 (file)
--- a/sql/kmr-mop.lisp
+++ b/sql/kmr-mop.lisp
@@ -16,7 +16,7 @@
 ;;; re-exports into CLSQL-USQL-SYS them to hide differences in
 ;;; MOP implementations.
 
 ;;; 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)
 
 #+lispworks
 (defun intern-eql-specializer (slot)

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index 60679fb409eb08d062beb0ccb8acc5ac1520af5d..ebedaa8a0ad7615064a7539087be2422f2989e26 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -1,7 +1,6 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================

-;;;; File:    metaclasses.lisp
-;;;; Updated: <04/04/2004 12:08:11 marcusp>
+;;;; $Id: $

 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================
 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================


@@ -12,7 +11,7 @@
 ;;;; ======================================================================
 
 
 ;;;; ======================================================================
 
 

-(in-package #:clsql-usql-sys)
+(in-package #:clsql-sys)

 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (>= (length (generic-function-lambda-list
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (>= (length (generic-function-lambda-list

diff --git a/sql/objects.lisp b/sql/objects.lisp
index 14bb76f8ddd3eb2f09e019d23191dfc7253f756b..6a18fe51df2d44ac77f3112efcdf723de0ea16a9 100644 (file)
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -1,8 +1,6 @@
 ;;;; -*- 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 ==========================================================
 ;;;; ======================================================================


@@ -12,7 +10,7 @@
 ;;;;
 ;;;; ======================================================================
 
 ;;;;
 ;;;; ======================================================================
 

-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)

 
 (defclass standard-db-object ()
   ((view-database
 
 (defclass standard-db-object ()
   ((view-database

diff --git a/sql/operations.lisp b/sql/operations.lisp
index b07c068bb34fad96d4bb7495fb9cbb9c36459569..b552e9855721aa3de37b63d9e6c86f3a4e1b7a4e 100644 (file)
--- a/sql/operations.lisp
+++ b/sql/operations.lisp
@@ -1,7 +1,6 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================

-;;;; File:    operations.lisp
-;;;; Updated: <04/04/2004 12:07:26 marcusp>
+;;;; $Id: $

 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================
 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================


@@ -11,7 +10,7 @@
 ;;;;
 ;;;; ======================================================================
 
 ;;;;
 ;;;; ======================================================================
 

-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)

 
 
 ;; Keep a hashtable for mapping symbols to sql generator functions,
 
 
 ;; Keep a hashtable for mapping symbols to sql generator functions,

diff --git a/sql/package.lisp b/sql/package.lisp
index 39f16a9b58ac7a33f034a0e806ca1e5477a78246..ef691b7f67b7771a2a9f7c092e23111b7c1f92bc 100644 (file)
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -1,9 +1,9 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================
 ;;;; File:    package.lisp
 ;;;; -*- 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
 ;;;; Created: 30/03/2004

-;;;; Updated: <04/04/2004 12:21:50 marcusp>
+;;;; Updated: $Id: $

 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================
 ;;;; ======================================================================
 ;;;;
 ;;;; Description ==========================================================


@@ -19,22 +19,21 @@
 
 #+sbcl
   (if (find-package 'sb-mop)
 
 #+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))
 
   #+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)
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defpackage #:clsql-usql-sys
-    (:nicknames #:usql-sys)
+  (defpackage #:clsql-sys

     (:use #:common-lisp #:clsql-base-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
          #+allegro #:mop
          #+lispworks #:clos
          #+scl #:clos


@@ -46,11 +45,11 @@
    #+lispworks
    (:shadowing-import-from 
     #:clos)
    #+lispworks
    (:shadowing-import-from 
     #:clos)

-   #+usql-sbcl-mop 
+   #+clsql-sbcl-mop 

    (:shadowing-import-from 
     #:sb-pcl
     #:generic-function-lambda-list)
    (:shadowing-import-from 
     #:sb-pcl
     #:generic-function-lambda-list)

-   #+usql-sbcl-pcl
+   #+clsql-sbcl-pcl

    (:shadowing-import-from 
     #:sb-pcl
     #:name
    (:shadowing-import-from 
     #:sb-pcl
     #:name


@@ -68,11 +67,11 @@
     #:make-method-lambda #:generic-function-lambda-list
     #:class-precedence-list #:slot-definition-type
     #:class-direct-superclasses)
     #: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)
    (:shadowing-import-from 
     #:pcl
     #:generic-function-lambda-list)

-   #+usql-cmucl-pcl
+   #+clsql-cmucl-pcl

    (:shadowing-import-from 
     #:pcl
     #:class-direct-slots
    (:shadowing-import-from 
     #:pcl
     #:class-direct-slots


@@ -397,15 +396,14 @@
 (setf *packages-for-warn-on-redefinition* 
       (delete "SQL" *packages-for-warn-on-redefinition* :test 'string=))
 
 (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  
   (: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)
   (progn
     ;; Note that this will no longer required for cmucl as of version 19a. 
     (in-package #+cmu :pcl #+sbcl :sb-pcl)


@@ -420,13 +418,13 @@
   
   #+sbcl
   (if (find-package 'sb-mop)
   
   #+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)
   
   #+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                                      
 
   
 );eval-when                                      
 

diff --git a/sql/sql.lisp b/sql/sql.lisp
index b5c72846315b56aa8836eed305e86019efbed75b..4ed2e81e72cd725fe1849811667ed7f478e90bb6 100644 (file)
--- a/sql/sql.lisp
+++ b/sql/sql.lisp
@@ -11,7 +11,7 @@
 ;;;;
 ;;;; ======================================================================
 
 ;;;;
 ;;;; ======================================================================
 

-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)

 
   
 ;;; Basic operations on databases
 
   
 ;;; Basic operations on databases

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index f3f8372ead60213381c58282821bb4c8ed757d10..76fb0711030b202b59d3f191865b1b3c2c6238d8 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -13,7 +13,7 @@
 ;;;;
 ;;;; ======================================================================
 
 ;;;;
 ;;;; ======================================================================
 

-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)

 
 (defvar *original-reader-enter* nil)
 
 
 (defvar *original-reader-enter* nil)
 

diff --git a/sql/table.lisp b/sql/table.lisp
index 715cef0199c619a84da3b566fb4e4efd5fbea4fc..1a225de5d76a48a31a063dc1eda332b55811c2c4 100644 (file)
--- a/sql/table.lisp
+++ b/sql/table.lisp
@@ -14,7 +14,7 @@
 ;;;;
 ;;;; ======================================================================
 
 ;;;;
 ;;;; ======================================================================
 

-(in-package :clsql-usql-sys)
+(in-package #:clsql-sys)

 
 
 ;; Utilities
 
 
 ;; Utilities


@@ -317,4 +317,4 @@ POSITION."
 
 (defun sequence-last (name &key (database *default-database*))
   "Return the last value of the sequence NAME in DATABASE."
 
 (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))