diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-10-12 14:35:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-10-12 14:35:59 +0000 |
commit | ec31468dae5339eb6f28900affc1a29ec6ac6371 (patch) | |
tree | 4e946163a3038edcd5408eb98ebbad3f94751b0e | |
parent | 3004a0ffefae5b5076dddf6f9531a29d390875be (diff) | |
parent | c7b645dbc14ad84f2b8b9415d79a98b5822e8fc5 (diff) | |
download | ceilometer-ec31468dae5339eb6f28900affc1a29ec6ac6371.tar.gz |
Merge "Change alarm_history.detail to text type" into milestone-proposed2013.2.rc22013.2
-rw-r--r-- | ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py | 38 | ||||
-rw-r--r-- | ceilometer/storage/sqlalchemy/models.py | 2 |
2 files changed, 39 insertions, 1 deletions
diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py new file mode 100644 index 00000000..bfb5d68b --- /dev/null +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py @@ -0,0 +1,38 @@ +# -*- encoding: utf-8 -*- + +# Copyright 2013 OpenStack Foundation +# All Rights Reserved. +# Copyright 2013 IBM Corp. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +from sqlalchemy import String +from sqlalchemy import Text +from sqlalchemy import MetaData +from sqlalchemy import Table + + +meta = MetaData() + + +def upgrade(migrate_engine): + meta.bind = migrate_engine + alm_hist = Table('alarm_history', meta, autoload=True) + alm_hist.c.detail.alter(type=Text) + + +def downgrade(migrate_engine): + meta.bind = migrate_engine + alm_hist = Table('alarm_history', meta, autoload=True) + alm_hist.c.detail.alter(type=String(255)) diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py index 7d3f6524..45f98cb5 100644 --- a/ceilometer/storage/sqlalchemy/models.py +++ b/ceilometer/storage/sqlalchemy/models.py @@ -237,7 +237,7 @@ class AlarmChange(Base): project_id = Column(String(255), ForeignKey('project.id')) user_id = Column(String(255), ForeignKey('user.id')) type = Column(String(20)) - detail = Column(String(255)) + detail = Column(Text) timestamp = Column(DateTime, default=timeutils.utcnow) |