Import Upstream version 2c0upstream/2c0

1 files changed, 5 insertions, 4 deletions

diff --git a/dbutil.scm b/dbutil.scm
index ffaaf9d..e99b073 100644
--- a/dbutil.scm
+++ b/dbutil.scm
@@ -1,5 +1,5 @@
 ;;; "dbutil.scm" relational-database-utilities
-; Copyright 1994, 1995 Aubrey Jaffer
+; Copyright 1994, 1995, 1997 Aubrey Jaffer
 ;
 ;Permission to copy this software, to redistribute it, and to use it
 ;for any purpose is granted, subject to the following restrictions and
@@ -18,6 +18,7 @@
 ;each case.
 
 (require 'relational-database)
+(require 'common-list-functions)
 
 (define (db:base-type path)
   'alist-table)				; currently the only one.
@@ -82,7 +83,7 @@
 	(2 #f name #f symbol)
 	(3 #f arity #f parameter-arity)
 	(4 #f domain #f domain)
-	(5 #f default #f expression)
+	(5 #f defaulter #f expression)
 	(6 #f expander #f expression)
 	(7 #f documentation #f string)))
      '(no-parameters
@@ -146,7 +147,7 @@
 	     (options ((parameter-table 'get* 'name)))
 	     (positions ((parameter-table 'get* 'index)))
 	     (arities ((parameter-table 'get* 'arity)))
-	     (defaults (map slib:eval ((parameter-table 'get* 'default))))
+	     (defaulters (map slib:eval ((parameter-table 'get* 'defaulter))))
 	     (domains ((parameter-table 'get* 'domain)))
 	     (types (map (((rdb 'open-table) '*domains-data* #f) 'get 'type-id)
 			 domains))
@@ -156,7 +157,7 @@
 		   (map (parameter-table 'get 'name)
 			((parameter-names 'get* 'parameter-index))))))
 	(command-callback comname comval options positions
-			  arities types defaults dirs aliases)))))
+			  arities types defaulters dirs aliases)))))
 
 (define (dbutil:define-tables rdb . spec-list)
   (define new-tables '())