diff options
| author | zhanggang <zhanggang@cmss.chinamobile.com> | 2018-07-16 11:27:34 +0800 |
|---|---|---|
| committer | zhanggang <zhanggang@cmss.chinamobile.com> | 2018-07-17 15:14:11 +0800 |
| commit | 474b0b3aaa6a46f5d000822c7c3fc38ad16fbd06 (patch) | |
| tree | 0cb9604740534da68714bc6d1d29d444852378dc /trove/configuration | |
| parent | 87fd1c4b0ec1f0788c0e0478acf80e7e280c16a4 (diff) | |
| download | trove-474b0b3aaa6a46f5d000822c7c3fc38ad16fbd06.tar.gz | |
Sync the data fields of DB* class and table fields.
This update try to fix some problems:
1. define the 'id' both in _data_fields and _auto_generated_attrs.
2. some of tables don't have the 'id' field.
3. _data_fields of DBInstance miss some table fields.
4. Change the key of persisted_models as the same of table name to
make it more readable.
Change-Id: I0ad96824e8de978ff5b6766085549b1e1a2509cf
Signed-off-by: zhanggang <zhanggang@cmss.chinamobile.com>
Diffstat (limited to 'trove/configuration')
| -rw-r--r-- | trove/configuration/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/trove/configuration/models.py b/trove/configuration/models.py index 599a1501..1b912ac6 100644 --- a/trove/configuration/models.py +++ b/trove/configuration/models.py @@ -228,6 +228,7 @@ class Configuration(object): class DBConfiguration(dbmodels.DatabaseModelBase): _data_fields = ['name', 'description', 'tenant_id', 'datastore_version_id', 'deleted', 'deleted_at', 'created', 'updated'] + _table_name = 'configurations' @property def datastore(self): @@ -245,9 +246,11 @@ class DBConfiguration(dbmodels.DatabaseModelBase): class DBConfigurationParameter(dbmodels.DatabaseModelBase): + _auto_generated_attrs = [] _data_fields = ['configuration_id', 'configuration_key', 'configuration_value', 'deleted', 'deleted_at'] + _table_name = 'configuration_parameters' def __hash__(self): return self.configuration_key.__hash__() @@ -255,7 +258,6 @@ class DBConfigurationParameter(dbmodels.DatabaseModelBase): class DBDatastoreConfigurationParameters(dbmodels.DatabaseModelBase): """Model for storing the configuration parameters on a datastore.""" - _auto_generated_attrs = ['id'] _data_fields = [ 'name', 'datastore_version_id', @@ -267,7 +269,6 @@ class DBDatastoreConfigurationParameters(dbmodels.DatabaseModelBase): 'deleted_at', ] _table_name = "datastore_configuration_parameters" - preserve_on_delete = True class DatastoreConfigurationParameters(object): |