From 1dbb1ed98f98a8b474f4d54df6554e4e1d93a296 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam Date: Mon, 6 Apr 2015 10:52:57 +0530 Subject: [PATCH] Cleans nullable=True in db model column declaration By default sqlalchemy considers the Column's nullable=True and this patch cleans those column declaration which is having default value for the nullable field as it is not required explicitly Change-Id: I22b0d62238298fa49da09c53019408bc2049b893 Closes-bug: #1439959 --- .../versions/033_software_config.py | 3 +-- heat/db/sqlalchemy/models.py | 17 +++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py index 9bfed20512..41ce5db462 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py @@ -27,8 +27,7 @@ def upgrade(migrate_engine): nullable=False), sqlalchemy.Column('created_at', sqlalchemy.DateTime), sqlalchemy.Column('updated_at', sqlalchemy.DateTime), - sqlalchemy.Column('name', sqlalchemy.String(255), - nullable=True), + sqlalchemy.Column('name', sqlalchemy.String(255)), sqlalchemy.Column('group', sqlalchemy.String(255)), sqlalchemy.Column('config', types.LongText), sqlalchemy.Column('io', types.Json), diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py index 9c3414f163..3de90832ea 100644 --- a/heat/db/sqlalchemy/models.py +++ b/heat/db/sqlalchemy/models.py @@ -168,11 +168,10 @@ class Stack(BASE, HeatBase, SoftDelete, StateAware): user_creds_id = sqlalchemy.Column( sqlalchemy.Integer, sqlalchemy.ForeignKey('user_creds.id')) - owner_id = sqlalchemy.Column(sqlalchemy.String(36), nullable=True) + owner_id = sqlalchemy.Column(sqlalchemy.String(36)) timeout = sqlalchemy.Column(sqlalchemy.Integer) disable_rollback = sqlalchemy.Column(sqlalchemy.Boolean, nullable=False) - stack_user_project_id = sqlalchemy.Column(sqlalchemy.String(64), - nullable=True) + stack_user_project_id = sqlalchemy.Column(sqlalchemy.String(64)) backup = sqlalchemy.Column('backup', sqlalchemy.Boolean) nested_depth = sqlalchemy.Column('nested_depth', sqlalchemy.Integer) convergence = sqlalchemy.Column('convergence', sqlalchemy.Boolean) @@ -280,7 +279,7 @@ class Resource(BASE, HeatBase, StateAware): uuid = sqlalchemy.Column(sqlalchemy.String(36), default=lambda: str(uuid.uuid4()), unique=True) - name = sqlalchemy.Column('name', sqlalchemy.String(255), nullable=True) + name = sqlalchemy.Column('name', sqlalchemy.String(255)) nova_instance = sqlalchemy.Column('nova_instance', sqlalchemy.String(255)) # odd name as "metadata" is reserved rsrc_metadata = sqlalchemy.Column('rsrc_metadata', types.Json) @@ -319,7 +318,7 @@ class WatchRule(BASE, HeatBase): __tablename__ = 'watch_rule' id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True) - name = sqlalchemy.Column('name', sqlalchemy.String(255), nullable=True) + name = sqlalchemy.Column('name', sqlalchemy.String(255)) rule = sqlalchemy.Column('rule', types.Json) state = sqlalchemy.Column('state', sqlalchemy.String(255)) last_evaluated = sqlalchemy.Column(sqlalchemy.DateTime, @@ -356,8 +355,7 @@ class SoftwareConfig(BASE, HeatBase): id = sqlalchemy.Column('id', sqlalchemy.String(36), primary_key=True, default=lambda: str(uuid.uuid4())) - name = sqlalchemy.Column('name', sqlalchemy.String(255), - nullable=True) + name = sqlalchemy.Column('name', sqlalchemy.String(255)) group = sqlalchemy.Column('group', sqlalchemy.String(255)) config = sqlalchemy.Column('config', types.Json) tenant = sqlalchemy.Column( @@ -388,8 +386,7 @@ class SoftwareDeployment(BASE, HeatBase, StateAware): output_values = sqlalchemy.Column('output_values', types.Json) tenant = sqlalchemy.Column( 'tenant', sqlalchemy.String(64), nullable=False, index=True) - stack_user_project_id = sqlalchemy.Column(sqlalchemy.String(64), - nullable=True) + stack_user_project_id = sqlalchemy.Column(sqlalchemy.String(64)) updated_at = sqlalchemy.Column(sqlalchemy.DateTime) @@ -402,7 +399,7 @@ class Snapshot(BASE, HeatBase): stack_id = sqlalchemy.Column(sqlalchemy.String(36), sqlalchemy.ForeignKey('stack.id'), nullable=False) - name = sqlalchemy.Column('name', sqlalchemy.String(255), nullable=True) + name = sqlalchemy.Column('name', sqlalchemy.String(255)) data = sqlalchemy.Column('data', types.Json) tenant = sqlalchemy.Column( 'tenant', sqlalchemy.String(64), nullable=False, index=True)