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

Timestamp:

05/24/09 19:38:28 (16 months ago)

Author:

sjamaan

Message:

Get rid of value/oid pair option. It complicates the code too much and isn't really useful at all. Besides, it also messes with the option to support list datatypes; how would you distinguish between a value/oid pair and a list?

Files:

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

release/4/postgresql/trunk/postgresql.scm

@@ -595 +595 @@
   (let* ((unparsers (pg-connection-type-unparsers conn))
          (unparse (lambda (x)
-                    (cond (raw x)
-                          ((find (lambda (parse?)
+                    (cond ((find (lambda (parse?)
                                    ((car parse?) x))
                                  unparsers) => (lambda (parse)
@@ -604 +603 @@
           (map   ;; See if this can be moved into C
            (lambda (p)
-             (let ((obj (unparse (if (pair? p) (car p) p)))
-                   (oid (if (pair? p) (cdr p) 0)))
+             (let ((obj (if raw p (unparse p))))
                (when (and (not (string? obj))
                           (not (blob? obj))
                           (not (sql-null? obj)))
                  (postgresql-error
-                  'exec-query (sprintf "Param value is not a string, sql-null or blob: ~S" p)
+                  'exec-query
+                  (sprintf "Param value is not a string, sql-null or blob: ~S" p)
                   conn query params format))
-               (when (not (integer? oid))
-                 (postgresql-error
-                  'exec-query (sprintf "Param type is not an oid: ~S" p)
-                  conn query params format))
-               (if (sql-null? obj) (cons #f oid) (cons obj oid)))) params))
+               (if (sql-null? obj) #f obj))) params))
          (send-query
           (foreign-lambda*
@@ -622 +617 @@
                  (int num) (scheme-object params) (int resfmt))
            "int res = 0, i = 0, *lens = NULL;"
-           "Oid *types = NULL;"
            "char **vals = NULL;"
            "int *fmts = NULL;"
            "C_word obj, cons;"
            "if (num > 0) {"
-           "    types = C_malloc(num * sizeof(Oid));"
            "    vals = C_malloc(num * sizeof(char *));"
            "    lens = C_malloc(num * sizeof(int));"
@@ -634 +627 @@
            "for (i=0,cons=params; i < num; ++i,cons=C_u_i_cdr(cons)) {"
            "    obj = C_u_i_car(cons);"
-           "    types[i] = C_num_to_int(C_u_i_cdr(obj));"
-           "    if (C_u_i_car(obj) == C_SCHEME_FALSE) {"
+           "    if (obj == C_SCHEME_FALSE) {"
            "        fmts[i] = 0; /* don't care */"
            "        lens[i] = 0;"
            "        vals[i] = NULL;"
-           "    } else if (C_header_bits(C_u_i_car(obj)) == C_BYTEVECTOR_TYPE) {"
+           "    } else if (C_header_bits(obj) == C_BYTEVECTOR_TYPE) {"
            "        fmts[i] = 1; /* binary */"
-           "        lens[i] = C_header_size(C_u_i_car(obj));"
-           "        vals[i] = C_c_string(C_u_i_car(obj));"
+           "        lens[i] = C_header_size(obj);"
+           "        vals[i] = C_c_string(obj);"
            "    } else {"
            "        /* text needs to be copied; it expects ASCIIZ */"
            "        fmts[i] = 0; /* text */"
-           "        lens[i] = C_header_size(C_u_i_car(obj));"
+           "        lens[i] = C_header_size(obj);"
            "        vals[i] = malloc(lens[i] + 1);"
-           "        memcpy(vals[i], C_c_string(C_u_i_car(obj)), lens[i]);"
+           "        memcpy(vals[i], C_c_string(obj), lens[i]);"
            "        vals[i][lens[i]] = '\\0';"
            "    }"
            "}"
-           "res = PQsendQueryParams(conn, query, num, "
-           "                        types, vals, lens, fmts, resfmt);"
+           "res = PQsendQueryParams(conn, query, num, NULL,"
+           "                        vals, lens, fmts, resfmt);"
            "for (i=0,cons=params; i < num; ++i,cons=C_u_i_cdr(cons)) {"
            "    obj = C_u_i_car(cons);"
-           "    if (!C_immediatep(C_u_i_car(obj)) &&"
-           "         C_header_bits(C_u_i_car(obj)) == C_STRING_TYPE)"
+           "    if (!C_immediatep(obj) && C_header_bits(obj) == C_STRING_TYPE)"
            "        free(vals[i]); /* Clear copied strings only */"
            "}"
@@ -664 +655 @@
            "    free(lens);"
            "    free(vals);"
-           "    free(types);"
            "}"
            "C_return(res);")))