From: Kevin M. Rosenberg Date: Sun, 24 Mar 2002 04:37:09 +0000 (+0000) Subject: r1649: *** empty log message *** X-Git-Tag: v3.8.6~1225 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=ba513c82016bfa0dfe3c3e5398fea1e78bada78b;ds=sidebyside r1649: *** empty log message *** --- diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl index ce8b7ce..caa8c55 100644 --- a/interfaces/mysql/mysql-loader.cl +++ b/interfaces/mysql/mysql-loader.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: mysql-loader.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $ +;;;; $Id: mysql-loader.cl,v 1.3 2002/03/24 04:37:09 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -54,10 +54,10 @@ set to the right path before compiling or loading the system.") (defvar *mysql-library-loaded* nil "T if foreign library was able to be loaded successfully") -(defmethod database-type-library-loaded ((database-type (eql :mysql))) +(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql))) *mysql-library-loaded*) -(defmethod database-type-load-foreign ((database-type (eql :mysql))) +(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql))) (when (and (uffi:load-foreign-library *mysql-library-filename* @@ -71,6 +71,6 @@ set to the right path before compiling or loading the system.") (setq *mysql-library-loaded* t))) -(database-type-load-foreign :mysql) +(clsql-sys:database-type-load-foreign :mysql) diff --git a/interfaces/mysql/mysql-package.cl b/interfaces/mysql/mysql-package.cl index 0dd231a..bb737f9 100644 --- a/interfaces/mysql/mysql-package.cl +++ b/interfaces/mysql/mysql-package.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: mysql-package.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $ +;;;; $Id: mysql-package.cl,v 1.3 2002/03/24 04:37:09 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,7 +20,7 @@ (in-package :cl-user) (defpackage :mysql - (:use :common-lisp :clsql-sys) + (:use :common-lisp) (:export #:database-library-loaded diff --git a/interfaces/postgresql/postgresql-loader.cl b/interfaces/postgresql/postgresql-loader.cl index a2b7988..f9d6f1c 100644 --- a/interfaces/postgresql/postgresql-loader.cl +++ b/interfaces/postgresql/postgresql-loader.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-loader.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $ +;;;; $Id: postgresql-loader.cl,v 1.3 2002/03/24 04:37:09 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -42,10 +42,12 @@ set to the right path before compiling or loading the system.") (defvar *postgresql-library-loaded* nil "T if foreign library was able to be loaded successfully") -(defmethod database-type-library-loaded ((database-type (eql :postgresql))) +(defmethod clsql-sys:database-type-library-loaded ((database-type + (eql :postgresql))) *postgresql-library-loaded*) -(defmethod database-type-load-foreign ((database-type (eql :postgresql))) +(defmethod clsql-sys:database-type-load-foreign ((database-type + (eql :postgresql))) (when (uffi:load-foreign-library *postgresql-library-filename* :module "postgresql" @@ -53,4 +55,4 @@ set to the right path before compiling or loading the system.") *postgresql-supporting-libraries*) (setq *postgresql-library-loaded* t))) -(database-type-load-foreign :postgresql) +(clsql-sys:database-type-load-foreign :postgresql) diff --git a/interfaces/postgresql/postgresql-package.cl b/interfaces/postgresql/postgresql-package.cl index 2957cee..7991f9a 100644 --- a/interfaces/postgresql/postgresql-package.cl +++ b/interfaces/postgresql/postgresql-package.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-package.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $ +;;;; $Id: postgresql-package.cl,v 1.3 2002/03/24 04:37:09 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -21,7 +21,7 @@ (defpackage :postgresql (:nicknames :pgsql) - (:use :common-lisp :clsql-sys) + (:use :common-lisp) (:export #:pgsql-oid #:pgsql-conn-status-type diff --git a/sql/sql.cl b/sql/sql.cl index ce3cc56..06431e4 100644 --- a/sql/sql.cl +++ b/sql/sql.cl @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: sql.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $ +;;;; $Id: sql.cl,v 1.3 2002/03/24 04:37:09 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -148,10 +148,6 @@ although there is an existing connection (~A)." (defvar *loaded-database-types* nil "Contains a list of database types which have been defined/loaded.") -(defvar *library-loaded-database-types* nil - "Contains a list of database types which have had their -foreign libraries loaded successfully.") - (defun reload-database-types () "Reloads any foreign code for the loaded database types after a dump." (mapc #'database-type-load-foreign *loaded-database-types*)) @@ -165,9 +161,7 @@ foreign libraries loaded successfully.") (defgeneric database-type-library-loaded (database-type) (:documentation "The internal generic implementation for checking if -database type library loaded successfully.") - (:method :after (database-type) - (pushnew database-type *library-loaded-database-types*))) +database type library loaded successfully.")) (defvar *default-database-type* nil "Specifies the default type of database. Currently only :mysql is