Changeset 143

Timestamp:

08/16/07 08:46:12

Author:

fumanchu

Message:

New Table.description attribute, plus lots of postgres reflection fixes.

Files:

• trunk/geniusql/adapters.py (modified) (1 diff)
• trunk/geniusql/objects.py (modified) (2 diffs)
• trunk/geniusql/providers/postgres.py (modified) (15 diffs)

trunk/geniusql/adapters.py

@@ -176 +176 @@
-        if value is None:
-            return None
+        if value in ('false', 'False'):
+            return False
-        return bool(value)
-

trunk/geniusql/objects.py

@@ -184 +184 @@
-    """
-    
-
+, description=None
-        return dict.__new__(cls)
-    
-
+, description=None
-        dict.__init__(self)
-        
@@ -194 +194 @@
-        self.schema = schema
-        self.created = created
+        self.description = description
-        
-        self.indices = schema.indexsetclass(self)

trunk/geniusql/providers/postgres.py

@@ -31 +31 @@
-        raise TypeError("unsupported operand type(s) for %s: "
-                        "%r and %r" % (op, op1.pytype, op2.pytype))
+
+
+class PgTIMESTAMPTZ_Adapter(adapters.Adapter):
+    
+    def push(self, value, dbtype):
+        if value is None:
+            return 'NULL'
+        return ("'%04d-%02d-%02d %02d:%02d:%02d'" %
+                (value.year, value.month, value.day,
+                 value.hour, value.minute, value.second))
+    
+    def pull(self, value, dbtype):
+        if value is None:
+            return None
+        if isinstance(value, datetime.datetime):
+            return value
+        chunks = (value[0:4], value[5:7], value[8:10],
+                  value[11:13], value[14:16], value[17:19],
+                  value[20:26] or 0)
+        return datetime.datetime(*map(int, chunks))
-
-
@@ -223 +243 @@
-# cidr        IPv4 or IPv6 network address
-# circle      circle in the plane
-# inet        IPv4 or IPv6 host address
-# line        infinite line in the plane
-# lseg        line segment in the plane
@@ -231 +250 @@
-# polygon     closed geometric path in the plane
-# timetz      time of day, including time zone
-# timestamptz date and time, including time zone
-
-
@@ -263 +281 @@
-class CHAR(dbtypes.SQL92CHAR):
-    """A fixed-length character string."""
-
+, 'BPCHAR'
-    default_adapters = {str: Pg_str_to_VARCHAR(),
-                        unicode: Pg_unicode_to_VARCHAR(),
@@ -285 +303 @@
-            return False
-        return True
+    
+    def __str__(self):
+        return "Infinity"
+    
+    def __repr__(self):
+        return "%s.%s()" % (self.__module__, self.__class__.__name__)
+
-
-
@@ -339 +364 @@
-    pass
-
+class TIMESTAMPTZ(dbtypes.SQL92TIMESTAMP):
+    """A date and time."""
+    default_adapters = {datetime.datetime: PgTIMESTAMPTZ_Adapter()}
+
-class DATE(dbtypes.SQL92DATE):
-    """A calendar date (year, month, day)."""
@@ -371 +400 @@
-
-
+class INET(dbtypes.FrozenByteType):
+    """An IPv4 or IPv6 host address, and optionally the subnet."""
+    # "The inet type holds an IPv4 or IPv6 host address, and optionally
+    # the identity of the subnet it is in, all in one field. The subnet
+    # identity is represented by stating how many bits of the host address
+    # represent the network address (the "netmask"). If the netmask is 32
+    # and the address is IPv4, then the value does not indicate a subnet,
+    # only a single host. In IPv6, the address length is 128 bits, so 128
+    # bits specify a unique host address. Note that if you want to accept
+    # networks only, you should use the cidr type rather than inet.
+    #
+    # The input format for this type is address/y where address is an IPv4
+    # or IPv6 address and y is the number of bits in the netmask. If the /y
+    # part is left off, then the netmask is 32 for IPv4 and 128 for IPv6,
+    # so the value represents just a single host. On display, the /y
+    # portion is suppressed if the netmask specifies a single host."
+    
+    variable = False
+    encoding = 'utf8'
+    
+    default_pytype = str
+    default_adapters = {str: adapters.str_to_SQL92VARCHAR(),
+                        unicode: adapters.unicode_to_SQL92VARCHAR(),
+                        None: adapters.Pickler(),
+                        }
+
-
-class PgTypeSet(dbtypes.DatabaseTypeSet):
@@ -379 +434 @@
-                   'int': [INT2, INT4, INT8],
-                   'bool': [BOOLEAN],
-
+, TIMESTAMPTZ
-                   'date': [DATE],
-                   'time': [TIME],
-                   'timedelta': [INTERVAL],
-                   'numeric': [DECIMAL],
-
+, INET
-                   }
-
@@ -495 +550 @@
-    
-    def _get_tables(self, conn=None):
+        data, _ = self.db.fetch("SELECT oid FROM pg_class WHERE "
+                                "relname = 'pg_class'", conn=conn)
+        pgclass_OID = data[0][0]
+        
-        data, _ = self.db.fetch(
-
-
+
+
+
+
+
+
-            conn=conn)
-        return [self.tableclass(row[0], self.db.quote(row[0]),
-
+, description=row[1]
-                for row in data]
-    
@@ -508 +571 @@
-        for name, in data:
-            if name == tablename:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        raise errors.MappingError(tablename)
-    
@@ -545 +624 @@
-            dbtype, _ = self.db.fetch("SELECT typname, typlen FROM pg_type "
-                                      "WHERE oid = %s" % row[1], conn=conn)
-
+
+
+
+
+
-            dbtype = dbtypetype()
-            
@@ -554 +637 @@
-            
-            if dbtypetype in (FLOAT4, FLOAT8):
-row[3]
+int(row[3])
-            elif dbtypetype in (MONEY, DECIMAL):
-(row[4] >> 16) & 65535
-(row[4] & 65535) - 4
+int((row[4] >> 16) & 65535)
+int((row[4] & 65535) - 4)
-            
-            if dbtypetype is VARCHAR:
-                # See http://archives.postgresql.org/pgsql-interfaces/2004-07/msg00021.php
-
+
+
+
+
+
-            else:
-row[3]
+int(row[3])
-                if bytes > 0:
-                    dbtype.bytes = bytes
@@ -574 +661 @@
-                default = default[0][0]
-                if default.startswith("nextval("):
-seqname
+'seqname'
-                    c.autoincrement = True
-                    c.sequence_name = seq_name.search(default).group(1)
-                    c.initial = self.db.fetch("SELECT min_value FROM %s" %
-
+[0]
-                    c.default = None
-                else:
-                    # adsrc is always a string, so we must cast it using
-                    # our guessed type. Be sure to strip any ::typename
-
-
+
+
+
+
+
+
+
+
+
+
-            else:
-                c.default = None
@@ -606 +701 @@
-            "pg_index.indrelid = %s" % table_OID, conn=conn)
-        for row in data:
+            iname = row[0]
+            q_iname = self.db.quote(iname)
+            uniq = bool(row[3])
-            # indkey is an "array" (we get a space-separated string of ints).
-            cols = map(int, row[1].split(" "))
@@ -612 +710 @@
-                                     "WHERE attrelid = %s AND attnum = %s"
-                                     % (table_OID, col), conn=conn)
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        return indices