[rhmessaging-commits] rhmessaging commits: r4181 - in mgmt/newdata: rosemary/python/rosemary and 1 other directory.

Author: justi9 Date: 2010-08-02 11:31:05 -0400 (Mon, 02 Aug 2010) New Revision: 4181 Modified: mgmt/newdata/mint/python/mint/update.py mgmt/newdata/rosemary/python/rosemary/model.py Log: * Remove the session id qmf header; we don't use it now * Correct the table name in sample tables' parent_id index Modified: mgmt/newdata/mint/python/mint/update.py =================================================================== --- mgmt/newdata/mint/python/mint/update.py 2010-08-02 14:44:59 UTC (rev 4180) +++ mgmt/newdata/mint/python/mint/update.py 2010-08-02 15:31:05 UTC (rev 4181) @@ -270,7 +270,6 @@ obj = cls.create_object(cursor) obj._qmf_agent_id = self.get_agent_id() obj._qmf_object_id = self.get_object_id() - obj._qmf_session_id = str(self.qmf_object.getObjectId().getSequence()) obj._qmf_create_time = create_time obj._qmf_update_time = update_time @@ -282,7 +281,6 @@ object_columns.append(table._id) object_columns.append(table._qmf_agent_id) object_columns.append(table._qmf_object_id) - object_columns.append(table._qmf_session_id) object_columns.append(table._qmf_create_time) object_columns.append(table._qmf_update_time) Modified: mgmt/newdata/rosemary/python/rosemary/model.py =================================================================== --- mgmt/newdata/rosemary/python/rosemary/model.py 2010-08-02 14:44:59 UTC (rev 4180) +++ mgmt/newdata/rosemary/python/rosemary/model.py 2010-08-02 15:31:05 UTC (rev 4181) @@ -178,10 +178,6 @@ self._qmf_object_id = RosemaryHeader(self, name, sql_text) self._qmf_object_id.title = "Object ID" - name = "_qmf_session_id" - self._qmf_session_id = RosemaryHeader(self, name, sql_text) - self._qmf_session_id.title = "Session ID" - name = "_qmf_create_time" self._qmf_create_time = RosemaryHeader(self, name, sql_timestamp) self._qmf_create_time.title = "Create Time" @@ -194,7 +190,6 @@ self._qmf_delete_time = RosemaryHeader(self, name, sql_timestamp) self._qmf_delete_time.title = "Delete Time" - self._qmf_session_id.optional = True self._qmf_delete_time.optional = True def load(self, elem, groups_by_name): @@ -313,7 +308,7 @@ parent_col = SqlColumn(self.sql_samples_table, name, sql_int8) parent_col.foreign_key_column = id_col - name = "%s_%s_index" % (self._name, parent_col.name) + name = "%s_%s_idx" % (self.sql_samples_table._name, parent_col.name) index = SqlIndex(self._package.sql_schema, name, (parent_col,)) name = "_qmf_update_time" @@ -321,9 +316,7 @@ def add_sql_constraints(self): name = "%s_qmf_id_uq" % self._name - cols = (self._qmf_agent_id.sql_column, - self._qmf_object_id.sql_column, - self._qmf_session_id.sql_column) + cols = (self._qmf_agent_id.sql_column, self._qmf_object_id.sql_column) SqlUniqueConstraint(self.sql_table, name, cols)