[rhmessaging-commits] rhmessaging commits: r2423 - in mgmt/trunk/mint: sql and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Fri Sep 5 15:16:34 EDT 2008
Author: nunofsantos
Date: 2008-09-05 15:16:33 -0400 (Fri, 05 Sep 2008)
New Revision: 2423
Modified:
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/python/mint/update.py
mgmt/trunk/mint/sql/schema.sql
Log:
renaming sourceId fields
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-09-05 18:58:27 UTC (rev 2422)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-09-05 19:16:33 UTC (rev 2423)
@@ -156,7 +156,7 @@
obj = self.objectsById[compositeId]
except KeyError:
try:
- obj = cls.selectBy(idSourceScope=id.first, idSourceObject=id.second, managedBroker=self.id)[0]
+ obj = cls.selectBy(sourceScopeId=id.first, sourceObjectId=id.second, managedBroker=self.id)[0]
self.objectsById[compositeId] = obj
except IndexError:
raise ObjectNotFound()
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-09-05 18:58:27 UTC (rev 2422)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-09-05 19:16:33 UTC (rev 2423)
@@ -7,8 +7,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -39,8 +39,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -115,8 +115,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -146,8 +146,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -174,8 +174,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -250,8 +250,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -292,8 +292,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -323,8 +323,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -365,8 +365,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -421,8 +421,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -464,8 +464,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -526,8 +526,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -556,8 +556,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -626,8 +626,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -741,8 +741,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -797,8 +797,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
@@ -846,8 +846,8 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- idSourceScope = BigIntCol(default=None)
- idSourceObject = BigIntCol(default=None)
+ sourceScopeId = BigIntCol(default=None)
+ sourceObjectId = BigIntCol(default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
managedBroker = StringCol(length=1000, default=None)
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-09-05 18:58:27 UTC (rev 2422)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-09-05 19:16:33 UTC (rev 2423)
@@ -132,8 +132,8 @@
self.generateForeignKeyAttrib(colPythonName[0].lower() + colPythonName[1:], keyPythonName)
self.generateMultipleJoin(origPythonName, pythonName, "stats")
else:
- self.generateAttrib("idSourceScope", "BigIntCol")
- self.generateAttrib("idSourceObject", "BigIntCol")
+ self.generateAttrib("sourceScopeId", "BigIntCol")
+ self.generateAttrib("sourceObjectId", "BigIntCol")
self.generateTimestampAttrib("creation")
self.generateTimestampAttrib("deletion")
self.generateAttrib("managedBroker", "StringCol", "length=1000")
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-09-05 18:58:27 UTC (rev 2422)
+++ mgmt/trunk/mint/python/mint/update.py 2008-09-05 19:16:33 UTC (rev 2423)
@@ -70,8 +70,8 @@
if "id" in attrs:
id = attrs.pop("id")
if (not cls.__name__.endswith("Stats")):
- attrs["idSourceScope"] = id.first
- attrs["idSourceObject"] = id.second
+ attrs["sourceScopeId"] = id.first
+ attrs["sourceObjectId"] = id.second
if "connectionRef" in attrs:
attrs["clientConnectionRef"] = attrs.pop("connectionRef")
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-09-05 18:58:27 UTC (rev 2422)
+++ mgmt/trunk/mint/sql/schema.sql 2008-09-05 19:16:33 UTC (rev 2423)
@@ -59,8 +59,8 @@
CREATE TABLE agent (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -82,8 +82,8 @@
CREATE TABLE binding (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -105,8 +105,8 @@
CREATE TABLE bridge (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -133,8 +133,8 @@
CREATE TABLE broker (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -162,8 +162,8 @@
CREATE TABLE client_connection (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -189,8 +189,8 @@
CREATE TABLE exchange (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -223,8 +223,8 @@
CREATE TABLE job (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -263,8 +263,8 @@
CREATE TABLE journal (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -316,8 +316,8 @@
CREATE TABLE link (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -341,8 +341,8 @@
CREATE TABLE queue (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -400,8 +400,8 @@
CREATE TABLE scheduler (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -439,8 +439,8 @@
CREATE TABLE session (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -465,8 +465,8 @@
CREATE TABLE slot (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -570,8 +570,8 @@
CREATE TABLE store (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -592,8 +592,8 @@
CREATE TABLE submitter (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -618,8 +618,8 @@
CREATE TABLE system (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
@@ -642,8 +642,8 @@
CREATE TABLE vhost (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- id_source_scope BIGINT,
- id_source_object BIGINT,
+ source_scope_id BIGINT,
+ source_object_id BIGINT,
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
managed_broker VARCHAR(1000),
More information about the rhmessaging-commits
mailing list