Changeset 832

Timestamp:

03/12/07 09:59:37 (1 year ago)

Author:

mfenniak

Message:

Updated paramstyle func + tests

Files:

• pg8000/trunk/pg8000.py (modified) (2 diffs)
• pg8000/trunk/pg8000-test.py (modified) (1 diff)

pg8000/trunk/pg8000.py

@@ -123 +123 @@
-        # param strings.
-        param_cnt = 1
-
+
+
+
+
-        for i in range((len(parts) / 2) + 1):
-            pidx = i * 2
@@ -139 +142 @@
-                    params.append(args[param_cnt-1])
-                    param_cnt += 1
+                elif src_style == "format":
+                    idx = part.find("%")
+                    if idx == -1:
+                        output += part
+                        break
+                    elif (idx+1) == len(part):
+                        raise ProgrammingError("parameter quote : found at end of unquoted str")
+                    output += part[:idx]
+                    if part[idx+1] == "%":
+                        # %% escapes a percent sign.
+                        output += "%"
+                    else:
+                        output += "$" + str(param_cnt)
+                        params.append(args[param_cnt - 1])
+                        param_cnt += 1
+                    part = part[idx+2:]
+                elif src_style == "numeric":
+                    idx = part.find(":")
+                    if idx == -1:
+                        output += part
+                        break
+                    elif (idx+1) == len(part):
+                        raise ProgrammingError("parameter quote : found at end of unquoted str")
+                    output += part[:idx]
+                    output += "$" + part[idx+1]
+                    part = part[idx+2:]
+                else:
+                    raise NotSupportedError("paramstyle %r not supported" % src_style)
-            parts[pidx] = output
-        retval = ""

pg8000/trunk/pg8000-test.py

@@ -8 +8 @@
-
-print "testing convert_paramstyle"
+
-new_query, new_args = pg8000.DBAPI.convert_paramstyle("qmark", "SELECT ?, ?, * FROM t WHERE a='say ''what?''' AND b=?", (1, 2, 3))
-assert new_query == "SELECT $1, $2, * FROM t WHERE a='say ''what?''' AND b=$3"
-assert new_args == (1, 2, 3)
+
+new_query, new_args = pg8000.DBAPI.convert_paramstyle("qmark", "SELECT ?, ?, * FROM t WHERE a=? AND b='are you ''sure?'", (1, 2, 3))
+assert new_query == "SELECT $1, $2, * FROM t WHERE a=$3 AND b='are you ''sure?'"
+assert new_args == (1, 2, 3)
+
+new_query, new_args = pg8000.DBAPI.convert_paramstyle("numeric", "SELECT :2, :1, * FROM t WHERE a=:3", (1, 2, 3))
+assert new_query == "SELECT $2, $1, * FROM t WHERE a=$3"
+assert new_args == (1, 2, 3)
+
+new_query, new_args = pg8000.DBAPI.convert_paramstyle("format", "SELECT %s, %s, * FROM t WHERE a=%s", (1, 2, 3))
+print repr(new_query), repr(new_args)
+assert new_query == "SELECT $1, $2, * FROM t WHERE a=$3"
+assert new_args == (1, 2, 3)
+
-
-#db = pg8000.Connection(host='joy', user='pg8000-test', database='pg8000-test', password='pg8000-test', socket_timeout=5)