r8859: package renaming

diff --git a/base/conditions.lisp b/base/conditions.lisp
index 138aa58fac6ddbdde4182d8a30f7b8b89ac79f08..c70f288749116256d1d36817ae8eb80df124b296 100644 (file)
--- a/base/conditions.lisp
+++ b/base/conditions.lisp
@@ -160,8 +160,6 @@ and signal an clsql-invalid-spec-error if they don't match."
   (cerror "Ignore this error and return nil."
          'clsql-nodb-error))
 
-;; for USQL support
-
 (define-condition clsql-type-error (clsql-error clsql-condition)
   ((slotname :initarg :slotname
             :reader clsql-type-error-slotname)

diff --git a/base/database.lisp b/base/database.lisp
index 839204f3c57de01fde008441a32a6b1d858cf2f3..e8845ae4346d531a81d536791309025044fec983 100644 (file)
--- a/base/database.lisp
+++ b/base/database.lisp
@@ -23,7 +23,6 @@
 (defvar *default-database* nil
   "Specifies the default database to be used.")
 
-;;; usql
 (defun find-database (database &key (errorp t) (db-type nil))
   "The function FIND-DATABASE, given a string DATABASE, searches
 amongst the connected databases for one matching the name DATABASE. If

diff --git a/base/recording.lisp b/base/recording.lisp
index b7565f97f3b263c04ebf22734335ead2410151fb..37d14d3ff6c6d7bcbd94e237b2b15f1c3fcdaf42 100644 (file)
--- a/base/recording.lisp
+++ b/base/recording.lisp
@@ -5,7 +5,7 @@
 ;;;; Description ==========================================================
 ;;;; ======================================================================
 ;;;;
-;;;; CLSQL-USQL broadcast streams which can be used to monitor the
+;;;; CLSQL broadcast streams which can be used to monitor the
 ;;;; flow of commands to, and results from, a database.
 ;;;;
 ;;;; ======================================================================

diff --git a/base/time.lisp b/base/time.lisp
index 75034cff21236ddf7cf6ad334cb45034f79422bd..381a77d2bb8b553c88191bba636b4cbdb296bd9c 100644 (file)
--- a/base/time.lisp
+++ b/base/time.lisp
@@ -8,7 +8,7 @@
 ;;;;
 ;;;; A variety of structures and function for creating and
 ;;;; manipulating dates, times, durations and intervals for
-;;;; CLSQL-USQL.
+;;;; CLSQL.
 ;;;;
 ;;;; This file was originally part of ODCL and is Copyright (c) 2002 -
 ;;;; 2003 onShore Development, Inc.

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index 7a59077f3c1ae4618c77747ad8d2bae835be3563..b8e394c0eaea9e676ca5c1487a61a1cfb5ca84f5 100644 (file)
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -295,7 +295,7 @@
   (declare (ignore owner))
   (remove-if #'(lambda (s)
                  (and (>= (length s) 10)
-                      (string= (subseq s 0 10) "_usql_seq_")))
+                      (string= (subseq s 0 10) "_clsql_seq_")))
              (mapcar #'car (database-query "SHOW TABLES" database nil))))
     
 ;; MySQL 4.1 does not support views 
@@ -340,11 +340,11 @@
 ;;; Sequence functions
 
 (defun %sequence-name-to-table (sequence-name)
-  (concatenate 'string "_usql_seq_" (sql-escape sequence-name)))
+  (concatenate 'string "_clsql_seq_" (sql-escape sequence-name)))
 
 (defun %table-name-to-sequence-name (table-name)
   (and (>= (length table-name) 10)
-       (string= (subseq table-name 0 10) "_usql_seq_")
+       (string= (subseq table-name 0 10) "_clsql_seq_")
        (subseq table-name 10)))
 
 (defmethod database-create-sequence (sequence-name
@@ -369,7 +369,7 @@
                                     &key (owner nil))
   (declare (ignore owner))
   (mapcar #'(lambda (s) (%table-name-to-sequence-name (car s)))
-          (database-query "SHOW TABLES LIKE '%usql_seq%'" 
+          (database-query "SHOW TABLES LIKE '%clsql_seq%'" 
                           database nil)))
 
 (defmethod database-set-sequence-position (sequence-name

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 24b47271821c031d307368a72fae661585e43c55..86b71ef476e1b94acdff9cc7f79d94436fabfac2 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -187,7 +187,7 @@
   ;; Query is copied from .table command of sqlite comamnd line utility.
   (remove-if #'(lambda (s)
                  (and (>= (length s) 10)
-                      (string= (subseq s 0 10) "_usql_seq_")))
+                      (string= (subseq s 0 10) "_clsql_seq_")))
              (mapcar #'car (database-query
                             "SELECT name FROM sqlite_master WHERE type='table' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='table' ORDER BY name"
                             database '()))))
@@ -226,11 +226,11 @@
        return (third field-info)))
 
 (defun %sequence-name-to-table-name (sequence-name)
-  (concatenate 'string "_usql_seq_" (sql-escape sequence-name)))
+  (concatenate 'string "_clsql_seq_" (sql-escape sequence-name)))
 
 (defun %table-name-to-sequence-name (table-name)
   (and (>= (length table-name) 10)
-       (string= (subseq table-name 0 10) "_usql_seq_")
+       (string= (subseq table-name 0 10) "_clsql_seq_")
        (subseq table-name 10)))
 
 (defmethod database-create-sequence (sequence-name