Changeset 219

Timestamp:

11/08/07 17:59:50

Author:

fumanchu

Message:

postgres: better str to bytea support.

Files:

• trunk/geniusql/providers/postgres.py (modified) (3 diffs)
• trunk/geniusql/test/zoo_fixture.py (modified) (1 diff)

trunk/geniusql/providers/postgres.py

@@ -219 +219 @@
-
-
-class PgBYTEA_Adapter(adapters.Pickler):
-    
-    def push(self, value, dbtype):
-        if value is None:
-            return 'NULL'
-        # See http://www.postgresql.org/docs/8.1/interactive/datatype-binary.html
-        value = pickle.dumps(value, 2)
-        def repl(char):
-            o = ord(char)
-            if o <= 31 or o == 39 or o == 92 or o >= 127:
-                return r"\\%03d" % int(oct(o))
-            return char
-        return "'%s'::bytea" % "".join(map(repl, value))
-
-
-class Pg_str_to_VARCHAR(adapters.str_to_SQL92VARCHAR):
-    
@@ -338 +323 @@
-                        "%r and %r" % (op, op1.pytype, op2.pytype))
-
+
+# ---------------------------- BYTEA Adapters ---------------------------- #
+
+
+class Pg_str_to_BYTEA(Pg_str_to_VARCHAR):
+    """Python str to PostgreSQL bytea adapter.
+    
+    For the most part, Postgres bytea works like Python's str: a sequence
+    of bytes. Certain bytes have to be octal-escaped for consumption by PG.
+    
+    See http://www.postgresql.org/docs/8.1/interactive/datatype-binary.html
+    """
+    
+    def push(self, value, dbtype):
+        if value is None:
+            return 'NULL'
+        def repl(char):
+            o = ord(char)
+            if o <= 31 or o == 39 or o == 92 or o >= 127:
+                return r"\\%03d" % int(oct(o))
+            return char
+        return "'%s'::bytea" % "".join(map(repl, value))
+
+
+class Pg_unicode_to_BYTEA(Pg_unicode_to_VARCHAR):
+    """Python unicode to PostgreSQL bytea adapter.
+    
+    For the most part, Postgres bytea works like Python's str: a sequence
+    of bytes. Certain bytes have to be octal-escaped for consumption by PG.
+    
+    See http://www.postgresql.org/docs/8.1/interactive/datatype-binary.html
+    """
+    
+    def push(self, value, dbtype):
+        if value is None:
+            return 'NULL'
+        if not isinstance(value, str):
+            value = value.encode(dbtype.encoding)
+        def repl(char):
+            o = ord(char)
+            if o <= 31 or o == 39 or o == 92 or o >= 127:
+                return r"\\%03d" % int(oct(o))
+            return char
+        return "'%s'::bytea" % "".join(map(repl, value))
+
+
+class PgBYTEA_Pickler(PgPickler):
+    """Python object to PostgreSQL bytea adapter.
+    
+    For the most part, Postgres bytea works like Python's str: a sequence
+    of bytes. Certain bytes have to be octal-escaped for consumption by PG.
+    
+    See http://www.postgresql.org/docs/8.1/interactive/datatype-binary.html
+    """
+    
+    def push(self, value, dbtype):
+        if value is None:
+            return 'NULL'
+        
+        value = pickle.dumps(value, 2)
+        
+        def repl(char):
+            o = ord(char)
+            if o <= 31 or o == 39 or o == 92 or o >= 127:
+                return r"\\%03d" % int(oct(o))
+            return char
+        return "'%s'::bytea" % "".join(map(repl, value))
-
-
@@ -365 +417 @@
-class BYTEA(dbtypes.FrozenByteType):
-    """A type for binary data ("byte array")."""
-
+
+
+
+
-    default_pytype = str
+    encoding = 'utf8'
-
-class BIT(dbtypes.SQL92VARCHAR):

trunk/geniusql/test/zoo_fixture.py

@@ -63 +63 @@
-        Zoo.add_index('ID')
-        Zoo['Name'] = schema.column()
+        
+        if db.__class__.__name__.endswith('PgDatabase'):
+            from geniusql.providers import postgres
+            Zoo['Name'].dbtype = postgres.BYTEA()
+            Zoo['Name'].adapter = postgres.Pg_unicode_to_BYTEA()
+        
-        Zoo['Founded'] = schema.column(datetime.date)
-        Zoo['Opens'] = schema.column(datetime.time)