Author: nunofsantos Date: 2008-04-28 18:21:11 -0400 (Mon, 28 Apr 2008) New Revision: 1988 Modified: mgmt/mint/python/mint/__init__.py mgmt/mint/python/mint/schema.py mgmt/mint/python/mint/schemaparser.py mgmt/mint/sql/schema.sql Log: store UUIDs in BLOB columns, not String columns Modified: mgmt/mint/python/mint/__init__.py =================================================================== --- mgmt/mint/python/mint/__init__.py 2008-04-25 15:44:24 UTC (rev 1987) +++ mgmt/mint/python/mint/__init__.py 2008-04-28 22:21:11 UTC (rev 1988) @@ -292,6 +292,10 @@ def sanitizeDict(self, d): if ("id" in d): d[self.convertIdKey("id")] = d.pop("id") + #XXX FIX -- fix handling of field tables + if ("arguments" in d): + d.pop("arguments") + #XXX FIX -- fix handling of field tables return d def convertIdKey(self, k): Modified: mgmt/mint/python/mint/schema.py =================================================================== --- mgmt/mint/python/mint/schema.py 2008-04-25 15:44:24 UTC (rev 1987) +++ mgmt/mint/python/mint/schema.py 2008-04-28 22:21:11 UTC (rev 1988) @@ -13,7 +13,7 @@ managedBroker = StringCol(length=1000, default=None) statsCurr = ForeignKey('SystemStats', cascade='null', default=None) statsPrev = ForeignKey('SystemStats', cascade='null', default=None) - sysId = StringCol(default=None) + sysId = BLOBCol(default=None) osName = StringCol(length=1000, default=None) nodeName = StringCol(length=1000, default=None) release = StringCol(length=1000, default=None) @@ -122,7 +122,7 @@ managedBroker = StringCol(length=1000, default=None) statsCurr = ForeignKey('AgentStats', cascade='null', default=None) statsPrev = ForeignKey('AgentStats', cascade='null', default=None) - id_ = StringCol(default=None) + id_ = BLOBCol(default=None) classInfos = dict() # brokerId => classInfo Modified: mgmt/mint/python/mint/schemaparser.py =================================================================== --- mgmt/mint/python/mint/schemaparser.py 2008-04-25 15:44:24 UTC (rev 1987) +++ mgmt/mint/python/mint/schemaparser.py 2008-04-28 22:21:11 UTC (rev 1988) @@ -22,7 +22,7 @@ # see xml/MintTypes.xml self.dataTypesMap = dict() self.dataTypesMap["objId"] = "ForeignKey" - self.dataTypesMap["uuid"] = "StringCol" + self.dataTypesMap["uuid"] = "BLOBCol" self.dataTypesMap["uint8"] = self.dataTypesMap["hilo8"] = self.dataTypesMap["count8"] = self.dataTypesMap["mma8"] = "SmallIntCol" self.dataTypesMap["uint16"] = self.dataTypesMap["hilo16"] = self.dataTypesMap["count16"] = self.dataTypesMap["mma16"] = "SmallIntCol" self.dataTypesMap["uint32"] = self.dataTypesMap["hilo32"] = self.dataTypesMap["count32"] = self.dataTypesMap["mma32"] = "IntCol" Modified: mgmt/mint/sql/schema.sql =================================================================== --- mgmt/mint/sql/schema.sql 2008-04-25 15:44:24 UTC (rev 1987) +++ mgmt/mint/sql/schema.sql 2008-04-28 22:21:11 UTC (rev 1988) @@ -59,7 +59,7 @@ managed_broker VARCHAR(1000), stats_curr_id INT, stats_prev_id INT, - id_ TEXT + id_ BYTEA ); CREATE TABLE agent_stats ( @@ -405,7 +405,7 @@ managed_broker VARCHAR(1000), stats_curr_id INT, stats_prev_id INT, - sys_id TEXT, + sys_id BYTEA, os_name VARCHAR(1000), node_name VARCHAR(1000), release VARCHAR(1000),