From 25e70e8a38e7c68f1295cbd34cafca2a39759955 Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Tue, 13 Mar 2001 17:21:26 +0000
Subject: [PATCH] Browser cleanups.

---
 ZMySQLDA/lib/python/Products/ZMySQLDA/DABase.py |  6 +++---
 ZMySQLDA/lib/python/Products/ZMySQLDA/db.py     | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ZMySQLDA/lib/python/Products/ZMySQLDA/DABase.py b/ZMySQLDA/lib/python/Products/ZMySQLDA/DABase.py
index 7d9750c..b2adc07 100755
--- a/ZMySQLDA/lib/python/Products/ZMySQLDA/DABase.py
+++ b/ZMySQLDA/lib/python/Products/ZMySQLDA/DABase.py
@@ -258,8 +258,8 @@ field_icons={
             "CHAR": "int", "DATE": "date",
             "DATETIME": "date", "DECIMAL": "float",
             "DOUBLE": "float", "FLOAT": "float",
-            "INT24": "int", "LONG": "int",
-            "LONGLONG": "int", "SHORT": "int",
-            "TIMESTAMP": "date", "TINY": "int",
+            "MEDIUMINT": "int", "INT": "int",
+            "LONGINT": "int", "SMALLINT": "int",
+            "TIMESTAMP": "date", "TINYINT": "int",
             "YEAR": "int"
             }
diff --git a/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py b/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py
index 87465e4..93f8a4e 100644
--- a/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py
+++ b/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py
@@ -120,8 +120,18 @@ class DB(TM):
         FIELD_TYPE.TINY: "i", FIELD_TYPE.YEAR: "i",
         }
 
-    types={}
-    for k, v in FIELD_TYPE.__dict__.items(): types[v]=k
+    types={
+        FIELD_TYPE.CHAR: "CHAR", FIELD_TYPE.DATE: "DATE",
+        FIELD_TYPE.DATETIME: "DATETIME", FIELD_TYPE.DECIMAL: "DECIMAL",
+        FIELD_TYPE.DOUBLE: "DOUBLE", FIELD_TYPE.FLOAT: "FLOAT",
+	FIELD_TYPE.INT24: "MEDIUMINT", FIELD_TYPE.VAR_STRING: "VARCHAR",
+        FIELD_TYPE.LONG: "INT", FIELD_TYPE.LONGLONG: "LONGINT",
+        FIELD_TYPE.SHORT: "SMALLINT", FIELD_TYPE.TIMESTAMP: "TIMESTAMP",
+        FIELD_TYPE.TINY: "TINYINT", FIELD_TYPE.YEAR: "YEAR",
+	FIELD_TYPE.ENUM: "ENUM", FIELD_TYPE.SET: "SET",
+	FIELD_TYPE.TINY_BLOB: "TINYBLOB", FIELD_TYPE.MEDIUM_BLOB: "MEDIUMBLOB",
+	FIELD_TYPE.BLOB: "BLOB", FIELD_TYPE.STRING: "STRING",
+        }
 
     conv={
         FIELD_TYPE.TIMESTAMP: _mysql_timestamp_converter,
@@ -141,6 +151,7 @@ class DB(TM):
     _p_oid=_p_changed=_registered=None
 
     def __init__(self,connection):
+	from _mysql import CLIENT
         self.connection=connection
         self.kwargs = kwargs = self._parse_connection_string(connection)
         self.db=apply(self.Database_Connection, (), kwargs)
@@ -195,7 +206,7 @@ class DB(TM):
                 'Type': self.types.get(type, '?'),
                 'Precision': p,
                 'Scale': scale,
-                'Nullable': null_ok,
+                'Nullable': null_ok and ' ' or "NOT NULL",
                 })
 
         return r