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

Timestamp:

05/27/09 00:41:57 (15 months ago)

Author:

sjamaan

Message:

Make the interface more awesome by making row/column numbers optional

Files:

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

release/4/postgresql/trunk/postgresql.scm

@@ -392 +392 @@
 
 ;; Unchecked version, for speed
-(define (value-at* result row column #!key raw)
+(define (value-at* result column row #!key raw)
   (if (PQgetisnull (pg-result-ptr result) row column)
       (sql-null)
@@ -410 +410 @@
             ((vector-ref (pg-result-value-parsers result) column) value)))))
 
-(define (value-at result row column #!key raw)
+(define (value-at result #!optional (column 0) (row 0) #!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)
+  (value-at* result column row raw: raw))
+
+(define (row-values result #!optional (row 0) #!key raw)
   (check-row-index! result row 'row)
   (let loop ((list '())
@@ -421 +421 @@
     (if (= column 0)
         list
-        (loop (cons (value-at* result row (sub1 column) raw: raw) list)
+        (loop (cons (value-at* result (sub1 column) row raw: raw) list)
               (sub1 column)))))
 
-(define (column-values result column #!key raw)
+(define (column-values result #!optional (column 0) #!key raw)
   (check-column-index! result column 'column)
   (let loop ((list '())
@@ -430 +430 @@
     (if (= row 0)
         list
-        (loop (cons (value-at* result (sub1 row) column raw: raw) list)
+        (loop (cons (value-at* result column (sub1 row) raw: raw) list)
               (sub1 row)))))
 
-;; (define (row-alist result row)
+;; (define (row-alist result #!optional (row 0))
 ;;   (map cons (column-names result) (row-values result row)))
-(define (row-alist result row)
+(define (row-alist result #!optional (row 0))
   (check-row-index! result row 'row-alist)
   (let loop ((alist '())
@@ -443 +443 @@
         (loop (cons (cons (string->symbol
                            (PQfname (pg-result-ptr result) (sub1 column)))
-                          (value-at* result row (sub1 column))) alist)
+                          (value-at* result (sub1 column) row)) alist)
               (sub1 column)))))