--- db.py.orig	Thu Apr 20 01:48:51 2000
+++ db.py	Thu Apr 20 02:02:08 2000
@@ -117,15 +117,28 @@
     ]
 
 class DB:
-
+ 
     defs={
-        "short": "i", "long": "i", "char": "s", "double": "n", "decimal": "n",
-        "float": "n", "tiny blob": "t", "medium blob": "t", "long blob": "t",
-        "blob": "t", "date": "d", "time": "s", "datetime": "d",
-        "timestamp": "d", "varchar": "t", "string": "t", "unhandled": "t",
+        FIELD_TYPE.CHAR: "i", FIELD_TYPE.DATE: "d",
+        FIELD_TYPE.DATETIME: "d", FIELD_TYPE.DECIMAL: "n",
+        FIELD_TYPE.DOUBLE: "n", FIELD_TYPE.FLOAT: "n", FIELD_TYPE.INT24: "i",
+        FIELD_TYPE.LONG: "i", FIELD_TYPE.LONGLONG: "l",
+        FIELD_TYPE.SHORT: "i", FIELD_TYPE.TIMESTAMP: "d",
+        FIELD_TYPE.TINY: "i", FIELD_TYPE.YEAR: "i",
+        }
+
+    conv={
+        FIELD_TYPE.TINY: int,
+        FIELD_TYPE.SHORT: int,
+        FIELD_TYPE.LONG: int,
+        FIELD_TYPE.FLOAT: float,
+        FIELD_TYPE.DOUBLE: float,
+        FIELD_TYPE.LONGLONG: long,
+        FIELD_TYPE.INT24: int,
+        FIELD_TYPE.YEAR: int
         }
 
-    Database_Error=MySQL.error
+    Database_Error=_mysql.Error
 
     def __init__(self,connection):
         self.connection=connection