Changeset 14765 for release/4/postgresql/trunk/postgresql.scm

Timestamp:

05/25/09 00:07:23 (10 months ago)

Author:

sjamaan

Message:

Rename to remove obnoxious result- prefix from procedures that happened to take a result object

Files:

• release/4/postgresql/trunk/postgresql.scm (modified) (7 diffs)

release/4/postgresql/trunk/postgresql.scm

@@ -29 +29 @@
   exec-simple-queries exec-query
   
-  result? clear-result! result-row-count result-column-count
-  result-column-index result-column-name result-column-names
-  result-column-format result-column-type result-column-type-modifier
-  result-table-oid result-table-column-index
-  result-value result-row result-row-alist result-column
-  result-affected-rows result-inserted-oid
+  result? clear-result! row-count column-count
+  column-index column-name column-names column-format
+  column-type column-type-modifier table-oid table-column-index
+  value-at row-values row-alist column-values affected-rows inserted-oid
 
   invalid-oid
@@ -315 +313 @@
     (PQclear result-ptr)))
 
-(define (result-row-count result)
+(define (row-count result)
   (PQntuples (pg-result-ptr result)))
 
-(define (result-column-count result)
+(define (column-count result)
   (PQnfields (pg-result-ptr result)))
 
 ;; Helper procedures for bounds checking; so we can distinguish between
 ;; out of bounds and nonexistant columns, and signal it.
-(define (check-result-column-index! result index location)
-  (when (>= index (result-column-count result))
+(define (check-column-index! result index location)
+  (when (>= index (column-count result))
     (postgresql-error
      location (sprintf "Result column ~A out of bounds" index) result index)))
 
-(define (check-result-row-index! result index location)
-  (when (>= index (result-row-count result))
+(define (check-row-index! result index location)
+  (when (>= index (row-count result))
     (postgresql-error
      location (sprintf "Result row ~A out of bounds" index) result index)))
 
-(define (result-column-name result index)
-  (check-result-column-index! result index 'result-column)
+(define (column-name result index)
+  (check-column-index! result index 'column-name)
   (string->symbol (PQfname (pg-result-ptr result) index)))
 
-(define (result-column-names result)
-  (let loop ((ptr (pg-result-ptr result))
-             (row '())
-             (idx (result-column-count result)))
-    (if (= idx 0)
-        row
-        (loop ptr (cons (string->symbol
-                         (PQfname ptr (sub1 idx))) row) (sub1 idx)))))
-
-(define (result-column-index result name)
+(define (column-names result)
+  (let ((ptr (pg-result-ptr result)))
+   (let loop ((names '())
+              (column (column-count result)))
+     (if (= column 0)
+         names
+         (loop (cons (string->symbol (PQfname ptr (sub1 column))) names)
+               (sub1 column))))))
+
+(define (column-index result name)
   (let ((idx (PQfnumber (pg-result-ptr result) (symbol->string name))))
     (and (>= idx 0) idx)))
 
-(define (result-table-oid result index)
-  (check-result-column-index! result index 'result-table-oid)
+(define (table-oid result index)
+  (check-column-index! result index 'table-oid)
   (let ((oid (PQftable (pg-result-ptr result) index)))
     (and (not (= oid invalid-oid)) oid)))
@@ -358 +356 @@
 ;; consistent with the rest of Scheme.  However, this is inconsistent with
 ;; almost all other PostgreSQL interfaces...
-(define (result-table-column-index result index)
-  (check-result-column-index! result index 'result-table-column-index)
+(define (table-column-index result index)
+  (check-column-index! result index 'table-column-index)
   (let ((idx (PQftablecol (pg-result-ptr result) index)))
     (and (> idx 0) (sub1 idx))))
@@ -375 +373 @@
       (postgresql-error 'format->symbol "Unknown format" symbol)))
 
-(define (result-column-format result index)
-  (check-result-column-index! result index 'result-column-format)
+(define (column-format result index)
+  (check-column-index! result index 'column-format)
   (format->symbol (PQfformat (pg-result-ptr result) index)))
 
-(define (result-column-type result index)
-  (check-result-column-index! result index 'result-column-type)
+(define (column-type result index)
+  (check-column-index! result index 'column-type)
   (PQftype (pg-result-ptr result) index))
 
 ;; This is really not super-useful as it requires intimate knowledge
 ;; about the internal implementations of types in PostgreSQL.
-(define (result-column-type-modifier result index)
-  (check-result-column-index! result index 'result-column-type)
+(define (column-type-modifier result index)
+  (check-column-index! result index 'column-type)
   (let ((mod (PQfmod (pg-result-ptr result) index)))
     (and (>= mod 0) mod)))
 
 ;; Unchecked version, for speed
-(define (result-value* result row column #!key raw)
+(define (value-at* result row column #!key raw)
   (if (PQgetisnull (pg-result-ptr result) row column)
       (sql-null)
@@ -409 +407 @@
             ((vector-ref (pg-result-value-parsers result) column) value)))))
 
-(define (result-value result row column #!key raw)
-  (check-result-row-index! result row 'result-value)
-  (check-result-column-index! result column 'result-value)
-  (result-value* result row column raw: raw))
-
-(define (result-row result row #!key raw)
-  (check-result-row-index! result row 'result-list)
+(define (value-at result row column #!key raw)
+  (check-row-index! result row 'value)
+  (check-column-index! result column 'value)
+  (value-at* result row column raw: raw))
+
+(define (row-values result row #!key raw)
+  (check-row-index! result row 'row)
   (let loop ((list '())
-             (column (result-column-count result)))
+             (column (column-count result)))
     (if (= column 0)
         list
-        (loop (cons (result-value* result row (sub1 column) raw: raw) list)
+        (loop (cons (value-at* result row (sub1 column) raw: raw) list)
               (sub1 column)))))
 
-(define (result-column result column #!key raw)
-  (check-result-column-index! result column 'result-list)
+(define (column-values result column #!key raw)
+  (check-column-index! result column 'column)
   (let loop ((list '())
-             (row (result-row-count result)))
+             (row (row-count result)))
     (if (= row 0)
         list
-        (loop (cons (result-value* result (sub1 row) column raw: raw) list)
+        (loop (cons (value-at* result (sub1 row) column raw: raw) list)
               (sub1 row)))))
 
-;; (define (result-row-alist result row)
-;;   (map cons (result-column-names result) (result-row result row)))
-(define (result-row-alist result row)
-  (check-result-row-index! result row 'result-alist)
+;; (define (row-alist result row)
+;;   (map cons (column-names result) (row-values result row)))
+(define (row-alist result row)
+  (check-row-index! result row 'row-alist)
   (let loop ((alist '())
-             (column (result-column-count result)))
+             (column (column-count result)))
     (if (= column 0)
         alist
         (loop (cons (cons (string->symbol
                            (PQfname (pg-result-ptr result) (sub1 column)))
-                          (result-value* result row (sub1 column))) alist)
+                          (value-at* result row (sub1 column))) alist)
               (sub1 column)))))
 
 ;;; TODO: Do we want/need PQnparams and PQparamtype bindings?
 
-(define (result-affected-rows result)
+(define (affected-rows result)
   (string->number (PQcmdTuples (pg-result-ptr result))))
 
-(define (result-inserted-oid result)
+(define (inserted-oid result)
   (let ((oid (PQoidValue (pg-result-ptr result))))
     (and (not (= oid invalid-oid)) oid)))
@@ -686 +684 @@
 (define (%query-fold kons knil conn query params)
   (let* ((result (exec-query conn query params))
-         (rows (result-row-count result)))
+         (rows (row-count result)))
     (let loop ((seed knil)
                (row 0))
       (if (= row rows)
           seed
-          (loop (kons (result-row result row) seed) (add1 row))))))
+          (loop (kons (row-values result row) seed) (add1 row))))))
 
 (define (%query-fold-right kons knil conn query params)
   (let* ((result (exec-query conn query params))
-         (rows (result-row-count result)))
+         (rows (row-count result)))
     (let loop ((seed knil)
                (row 0))
       (if (= row rows)
           seed
-          (kons (result-row result row) (loop seed (add1 row)))))))
+          (kons (row-values result row) (loop seed (add1 row)))))))
 
 (define (query-fold kons knil conn query . params)
@@ -726 +724 @@
 (define (%query-map proc conn query params)
   (let ((result (exec-query conn query params)))
-    (let loop ((ans '())
-               (row (result-row-count result)))
+    (let loop ((lst '())
+               (row (row-count result)))
       (if (= row 0)
-          ans
-          (loop (cons (proc (result-row result (sub1 row))) ans) (sub1 row))))))
+          lst
+          (loop (cons (proc (row-values result (sub1 row))) lst) (sub1 row))))))
 (define (query-map proc conn query . params)
   (%query-map proc conn query params))