Changeset 5227

Timestamp:

05/14/07 05:48:24 (1 year ago)

Author:

mtredinnick

Message:

Reintroduced support for parameter dictionaries when using the PostgreSQL
psycopg1 backend directly. Refs #3322. Based on a patch from kurtiss@meetro.com.

Files:

• django/branches/unicode/AUTHORS (modified) (1 diff)
• django/branches/unicode/django/db/backends/postgresql/base.py (modified) (1 diff)

django/branches/unicode/AUTHORS

@@ -142 +142 @@
-    Joseph Kocherhans
-    konrad@gwu.edu
+    kurtiss@meetro.com
-    lakin.wecker@gmail.com
-    Stuart Langridge <http://www.kryogenix.org/>

django/branches/unicode/django/db/backends/postgresql/base.py

@@ -41 +41 @@
-        self.charset = charset
-
+    def format_params(self, params):
+        if isinstance(params, dict):
+            result = {}
+            charset = self.charset
+            for key, value in params.items():
+                result[smart_str(key, charset)] = smart_str(value, charset)
+            return result
+        else:
+            return tuple([smart_str(p, self.charset, True) for p in params])
+
-    def execute(self, sql, params=()):
-[smart_str(p, self.charset, True) for p in params]
+self.format_params(params)
-
-    def executemany(self, sql, param_list):
-tuple([smart_str(p, self.charset) for p in params]
+self.format_params(params
-        return self.cursor.executemany(sql, new_param_list)
-