From e06ca99080d17083dcfcf3f148de4a8796773e78 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 Apr 2004 17:50:18 +0000 Subject: [PATCH] r8859: package renaming --- base/conditions.lisp | 2 -- base/database.lisp | 1 - base/recording.lisp | 2 +- base/time.lisp | 2 +- db-mysql/mysql-sql.lisp | 8 ++++---- db-sqlite/sqlite-sql.lisp | 6 +++--- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/base/conditions.lisp b/base/conditions.lisp index 138aa58..c70f288 100644 --- 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 839204f..e8845ae 100644 --- 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 b7565f9..37d14d3 100644 --- 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 75034cf..381a77d 100644 --- 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 7a59077..b8e394c 100644 --- 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 24b4727..86b71ef 100644 --- 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 -- 2.34.1