From 7f0e4a65d1b425f2fa58fc7cce8296c1a6c52c2f Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 Apr 2004 14:42:39 +0000 Subject: [PATCH] r8848: more usql to clsql renaming --- CONTRIBUTORS | 2 +- clsql-usql-tests.asd => clsql-tests.asd | 24 ++++++++-------- clsql-usql.asd => clsql.asd | 23 ++++++++-------- {usql => sql}/README | 0 sql/basic-cmds.lisp | 32 ++++++++++++++++++++++ {usql => sql}/classes.lisp | 0 {usql => sql}/kmr-mop.lisp | 0 {usql => sql}/metaclasses.lisp | 0 {usql => sql}/objects.lisp | 0 {usql => sql}/operations.lisp | 0 {usql => sql}/package.lisp | 0 {usql => sql}/sql.lisp | 0 {usql => sql}/syntax.lisp | 0 {usql => sql}/table.lisp | 0 {usql-tests => tests}/README | 0 {usql-tests => tests}/package.lisp | 0 {usql-tests => tests}/test-connection.lisp | 0 {usql-tests => tests}/test-fddl.lisp | 0 {usql-tests => tests}/test-fdml.lisp | 0 {usql-tests => tests}/test-init.lisp | 0 {usql-tests => tests}/test-ooddl.lisp | 0 {usql-tests => tests}/test-oodml.lisp | 0 {usql-tests => tests}/test-syntax.lisp | 0 23 files changed, 58 insertions(+), 23 deletions(-) rename clsql-usql-tests.asd => clsql-tests.asd (53%) rename clsql-usql.asd => clsql.asd (65%) rename {usql => sql}/README (100%) create mode 100644 sql/basic-cmds.lisp rename {usql => sql}/classes.lisp (100%) rename {usql => sql}/kmr-mop.lisp (100%) rename {usql => sql}/metaclasses.lisp (100%) rename {usql => sql}/objects.lisp (100%) rename {usql => sql}/operations.lisp (100%) rename {usql => sql}/package.lisp (100%) rename {usql => sql}/sql.lisp (100%) rename {usql => sql}/syntax.lisp (100%) rename {usql => sql}/table.lisp (100%) rename {usql-tests => tests}/README (100%) rename {usql-tests => tests}/package.lisp (100%) rename {usql-tests => tests}/test-connection.lisp (100%) rename {usql-tests => tests}/test-fddl.lisp (100%) rename {usql-tests => tests}/test-fdml.lisp (100%) rename {usql-tests => tests}/test-init.lisp (100%) rename {usql-tests => tests}/test-ooddl.lisp (100%) rename {usql-tests => tests}/test-oodml.lisp (100%) rename {usql-tests => tests}/test-syntax.lisp (100%) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 43bd401..c0d8591 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,7 +2,7 @@ CLSQL Contributors ------------------ Kevin Rosenberg (main author CLSQL) Pierre Mai (original author MaiSQL from which CLSQL was based) -Marcus Pearce (initial port of USQL to CLSQL) +Marcus Pearce (initial port of USQL to CLSQL) Marc Battyani diff --git a/clsql-usql-tests.asd b/clsql-tests.asd similarity index 53% rename from clsql-usql-tests.asd rename to clsql-tests.asd index 07cbdbd..a9486ac 100644 --- a/clsql-usql-tests.asd +++ b/clsql-tests.asd @@ -1,29 +1,31 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- -;;;; ====================================================================== -;;;; File: clsql-usql-tests.asd +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; File: clsql-tests.asd ;;;; Author: Marcus Pearce ;;;; Created: 30/03/2004 ;;;; Updated: <04/04/2004 12:34:41 marcusp> -;;;; ====================================================================== -;;;; -;;;; Description ========================================================== -;;;; ====================================================================== ;;;; -;;;; ASDF system definition for CLSQL-USQL test suite. +;;;; $Id: clsql-classic.asd 8847 2004-04-07 14:38:14Z kevin $ ;;;; +;;;; 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) -(asdf:defsystem :clsql-usql-tests - :name "CLSQL-USQL Tests" +(asdf:defsystem clsql-tests + :name "CLSQL Tests" :author "" :maintainer "" :version "" :licence "" :description "A regression test suite for CLSQL-USQL." :components - ((:module usql-tests + ((:module tests :serial t :components ((:file "package") (:file "test-init") @@ -33,4 +35,4 @@ (:file "test-ooddl") (:file "test-oodml") (:file "test-syntax")))) - :depends-on (:clsql-usql :rt)) + :depends-on (:clsql :rt)) diff --git a/clsql-usql.asd b/clsql.asd similarity index 65% rename from clsql-usql.asd rename to clsql.asd index e10d556..cebcee1 100644 --- a/clsql-usql.asd +++ b/clsql.asd @@ -1,17 +1,18 @@ ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- -;;;; ====================================================================== -;;;; File: usql.asd -;;;; Author: Marcus Pearce -;;;; Created: 30/03/2004 -;;;; Updated: <04/04/2004 11:58:21 marcusp> -;;;; ====================================================================== +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION ;;;; -;;;; Description ========================================================== -;;;; ====================================================================== +;;;; Name: clsql-classic.asd +;;;; Purpose: System definition for CLSQL-CLASSIC +;;;; Authors: Marcus Pearce and Kevin M. Rosenberg +;;;; Created: March 2004 ;;;; -;;;; ASDF system definition for CLSQL-USQL. +;;;; $Id: clsql-classic.asd 8847 2004-04-07 14:38:14Z kevin $ ;;;; -;;;; ====================================================================== +;;;; 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. +;;;; ************************************************************************* (asdf:defsystem #:clsql-usql :name "CLSQL-USQL" @@ -26,7 +27,7 @@ the low-level database interfaces provided by CLSQL and includes both a functional and an object oriented interface." :depends-on (clsql-base) :components - ((:module usql + ((:module sql :components ((:module :package :pathname "" diff --git a/usql/README b/sql/README similarity index 100% rename from usql/README rename to sql/README diff --git a/sql/basic-cmds.lisp b/sql/basic-cmds.lisp new file mode 100644 index 0000000..a8241b9 --- /dev/null +++ b/sql/basic-cmds.lisp @@ -0,0 +1,32 @@ + +(defmethod database-query (query-expression (database closed-database) types) + (declare (ignore query-expression types)) + (signal-closed-database-error database)) + +(defmethod database-query (query-expression (database t) types) + (declare (ignore query-expression types)) + (signal-no-database-error)) + +(defmethod database-execute-command (sql-expression (database closed-database)) + (declare (ignore sql-expression)) + (signal-closed-database-error database)) + +(defmethod database-execute-command (sql-expression (database t)) + (declare (ignore sql-expression)) + (signal-no-database-error)) + +(defgeneric execute-command (expression &key database) + (:documentation + "Executes the SQL command specified by EXPRESSION for the database +specified by DATABASE, which has a default value of +*DEFAULT-DATABASE*. The argument EXPRESSION may be any SQL statement +other than a query. To run a stored procedure, pass an appropriate +string. The call to the procedure needs to be wrapped in a BEGIN END +pair.")) + +(defmethod execute-command ((sql-expression string) + &key (database *default-database*)) + (record-sql-command sql-expression database) + (let ((res (database-execute-command sql-expression database))) + (record-sql-result res database)) + (values)) diff --git a/usql/classes.lisp b/sql/classes.lisp similarity index 100% rename from usql/classes.lisp rename to sql/classes.lisp diff --git a/usql/kmr-mop.lisp b/sql/kmr-mop.lisp similarity index 100% rename from usql/kmr-mop.lisp rename to sql/kmr-mop.lisp diff --git a/usql/metaclasses.lisp b/sql/metaclasses.lisp similarity index 100% rename from usql/metaclasses.lisp rename to sql/metaclasses.lisp diff --git a/usql/objects.lisp b/sql/objects.lisp similarity index 100% rename from usql/objects.lisp rename to sql/objects.lisp diff --git a/usql/operations.lisp b/sql/operations.lisp similarity index 100% rename from usql/operations.lisp rename to sql/operations.lisp diff --git a/usql/package.lisp b/sql/package.lisp similarity index 100% rename from usql/package.lisp rename to sql/package.lisp diff --git a/usql/sql.lisp b/sql/sql.lisp similarity index 100% rename from usql/sql.lisp rename to sql/sql.lisp diff --git a/usql/syntax.lisp b/sql/syntax.lisp similarity index 100% rename from usql/syntax.lisp rename to sql/syntax.lisp diff --git a/usql/table.lisp b/sql/table.lisp similarity index 100% rename from usql/table.lisp rename to sql/table.lisp diff --git a/usql-tests/README b/tests/README similarity index 100% rename from usql-tests/README rename to tests/README diff --git a/usql-tests/package.lisp b/tests/package.lisp similarity index 100% rename from usql-tests/package.lisp rename to tests/package.lisp diff --git a/usql-tests/test-connection.lisp b/tests/test-connection.lisp similarity index 100% rename from usql-tests/test-connection.lisp rename to tests/test-connection.lisp diff --git a/usql-tests/test-fddl.lisp b/tests/test-fddl.lisp similarity index 100% rename from usql-tests/test-fddl.lisp rename to tests/test-fddl.lisp diff --git a/usql-tests/test-fdml.lisp b/tests/test-fdml.lisp similarity index 100% rename from usql-tests/test-fdml.lisp rename to tests/test-fdml.lisp diff --git a/usql-tests/test-init.lisp b/tests/test-init.lisp similarity index 100% rename from usql-tests/test-init.lisp rename to tests/test-init.lisp diff --git a/usql-tests/test-ooddl.lisp b/tests/test-ooddl.lisp similarity index 100% rename from usql-tests/test-ooddl.lisp rename to tests/test-ooddl.lisp diff --git a/usql-tests/test-oodml.lisp b/tests/test-oodml.lisp similarity index 100% rename from usql-tests/test-oodml.lisp rename to tests/test-oodml.lisp diff --git a/usql-tests/test-syntax.lisp b/tests/test-syntax.lisp similarity index 100% rename from usql-tests/test-syntax.lisp rename to tests/test-syntax.lisp -- 2.34.1