Force loading of pgsql from ESCAPE-PGSQL-STRING.

diff --git a/v7/src/runtime/pgsql.scm b/v7/src/runtime/pgsql.scm
index e6297c9a83e5eb17d75d84a384629c91d1ed0f1f..785c892545d61fec9d577b11fa924ba12343708b 100644 (file)
--- a/v7/src/runtime/pgsql.scm
+++ b/v7/src/runtime/pgsql.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: pgsql.scm,v 1.8 2003/11/11 04:46:39 cph Exp $
+$Id: pgsql.scm,v 1.9 2004/11/25 04:00:06 cph Exp $
 
 Copyright 2003 Massachusetts Institute of Technology
 
@@ -157,6 +157,10 @@ USA.
                                        set-result-handle!))
               (set! pgsql-initialized? #t)))
         #t)))
+
+(define (guarantee-pgsql-available)
+  (if (not (pgsql-available?))
+      (error "No PostgreSQL support in this sytem.")))
 \f
 (define condition-type:pgsql-error
   (make-condition-type 'PGSQL-ERROR condition-type:error '()
@@ -207,8 +211,7 @@ USA.
       (write-string "." port)))
 \f
 (define (open-pgsql-conn parameters #!optional wait?)
-  (if (not (pgsql-available?))
-      (error "No PostgreSQL support in this sytem."))
+  (guarantee-pgsql-available)
   (let ((wait? (if (default-object? wait?) #t wait?)))
     (make-gc-finalized-object
      connections
@@ -280,6 +283,7 @@ USA.
   (index->name (pq-status (connection->handle connection)) connection-status))
 \f
 (define (escape-pgsql-string string)
+  (guarantee-pgsql-available)
   (let ((escaped (make-string (fix:* 2 (string-length string)))))
     (set-string-maximum-length! escaped (pq-escape-string string escaped))
     escaped))

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 23f9b83c4bb0c5c10cdf976ce0e7304c3fb514a4..1c3df74b1650d94da73f584e4690d489d096a4c3 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.517 2004/11/19 07:14:49 cph Exp $
+$Id: runtime.pkg,v 14.518 2004/11/25 04:00:21 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -4707,6 +4707,7 @@ USA.
          condition-type:pgsql-query-error
          escape-pgsql-string
          exec-pgsql-query
+         guarantee-pgsql-available
          make-empty-pgsql-result
          open-pgsql-conn
          pgsql-available?