From 27635f61adae5a49f9986762acf13daa0437826b Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 15 May 2002 17:10:47 +0000
Subject: [PATCH] r2049: moved cmucl-compat files

---
 Makefile                                 |  4 ++--
 {cmucl-compat => base}/Makefile          |  0
 {cmucl-compat => base}/cmucl-compat.cl   |  2 +-
 clsql-base.system                        |  5 +++--
 clsql.system                             | 12 +++---------
 cmucl-compat/.cvsignore                  |  1 -
 interfaces/postgresql/postgresql-usql.cl |  4 ++--
 {cmucl-compat => sql}/loop-extension.cl  |  2 +-
 8 files changed, 12 insertions(+), 18 deletions(-)
 rename {cmucl-compat => base}/Makefile (100%)
 rename {cmucl-compat => base}/cmucl-compat.cl (98%)
 delete mode 100755 cmucl-compat/.cvsignore
 rename {cmucl-compat => sql}/loop-extension.cl (98%)

diff --git a/Makefile b/Makefile
index 1b2e4fb..5e29581 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.18 2002/05/13 03:24:41 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.19 2002/05/15 17:10:28 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,7 +15,7 @@
 
 PKG:=clsql
 DEBPKG=cl-sql
-SUBDIRS:=interfaces sql cmucl-compat
+SUBDIRS:=interfaces sql base
 DOCSUBDIRS:=doc
 
 include Makefile.common
diff --git a/cmucl-compat/Makefile b/base/Makefile
similarity index 100%
rename from cmucl-compat/Makefile
rename to base/Makefile
diff --git a/cmucl-compat/cmucl-compat.cl b/base/cmucl-compat.cl
similarity index 98%
rename from cmucl-compat/cmucl-compat.cl
rename to base/cmucl-compat.cl
index f2dde00..85cc280 100644
--- a/cmucl-compat/cmucl-compat.cl
+++ b/base/cmucl-compat.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: cmucl-compat.cl,v 1.1 2002/03/23 14:04:49 kevin Exp $
+;;;; $Id: cmucl-compat.cl,v 1.1 2002/05/15 17:10:28 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-base.system b/clsql-base.system
index 8a13152..51b0c58 100644
--- a/clsql-base.system
+++ b/clsql-base.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.system,v 1.4 2002/05/14 16:23:37 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.5 2002/05/15 17:10:28 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -31,7 +31,8 @@
     :source-pathname "CL-LIBRARY:clsql;base;"
     :source-extension "cl"
     :binary-pathname "CL-LIBRARY:clsql;base;bin;"
-    :components ((:file "package")
+    :components ((:file "cmucl-compat")
+		 (:file "package")
 		 (:file "classes" :depends-on ("package"))
 		 (:file "conditions" :depends-on ("classes"))
 		 (:file "db-interface" :depends-on ("conditions"))
diff --git a/clsql.system b/clsql.system
index 9b3fa34..aa63476 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.12 2002/05/13 05:24:57 kevin Exp $
+;;;; $Id: clsql.system,v 1.13 2002/05/15 17:10:28 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -27,24 +27,18 @@
 
 ;;; System definitions
 
-(mk:defsystem :cmucl-compat
-    :source-pathname "CL-LIBRARY:clsql;cmucl-compat;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;cmucl-compat;bin;"
-    :components ((:file "cmucl-compat")
-		 (:file "loop-extension")))
-
 (mk:defsystem :clsql
     :source-pathname "CL-LIBRARY:clsql;sql;"
     :source-extension "cl"
     :binary-pathname "CL-LIBRARY:clsql;sql;bin;"
     :components ((:file "pool")
+		 (:file "loop-extension")
 		 (:file "sql" :depends-on ("pool"))
 		 (:file "transactions" :depends-on ("sql"))
 		 (:file "utils")
 		 (:file "functional" :depends-on ("sql"))
 		 (:file "usql" :depends-on ("sql")))
-    :depends-on (:clsql-base :cmucl-compat)
+    :depends-on (:clsql-base)
     :finally-do
     (pushnew :clsql cl:*features*)
     )
diff --git a/cmucl-compat/.cvsignore b/cmucl-compat/.cvsignore
deleted file mode 100755
index ca8d09f..0000000
--- a/cmucl-compat/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.bin
diff --git a/interfaces/postgresql/postgresql-usql.cl b/interfaces/postgresql/postgresql-usql.cl
index eeee53b..4633f39 100644
--- a/interfaces/postgresql/postgresql-usql.cl
+++ b/interfaces/postgresql/postgresql-usql.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg and onShore Development Inc
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: postgresql-usql.cl,v 1.3 2002/05/15 17:03:43 kevin Exp $
+;;;; $Id: postgresql-usql.cl,v 1.4 2002/05/15 17:10:28 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and by onShore Development Inc.
@@ -39,7 +39,7 @@
 	  (mapcar #'car
 		  (database-query
 		   (format nil
-			   "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'" relname)
+			   "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'" table)
 		   database nil))))
     (if result
 	(reverse
diff --git a/cmucl-compat/loop-extension.cl b/sql/loop-extension.cl
similarity index 98%
rename from cmucl-compat/loop-extension.cl
rename to sql/loop-extension.cl
index 4eec894..a36e1cc 100644
--- a/cmucl-compat/loop-extension.cl
+++ b/sql/loop-extension.cl
@@ -8,7 +8,7 @@
 ;;;;
 ;;;; Copyright (c) 1999-2001 Pierre R. Mai
 ;;;;
-;;;; $Id: loop-extension.cl,v 1.1 2002/03/23 14:04:49 kevin Exp $
+;;;; $Id: loop-extension.cl,v 1.1 2002/05/15 17:10:28 kevin Exp $
 ;;;;
 ;;;; The functions in this file were orignally distributed in the
 ;;;; MaiSQL package in the file sql/sql.cl
-- 
2.34.1