Merge "correct column types in events"

This commit is contained in:
Jenkins 2015-03-03 11:42:21 +00:00 committed by Gerrit Code Review
commit 2c54bde86c
2 changed files with 3 additions and 3 deletions

View File

@ -294,7 +294,7 @@ class Connection(base.Connection):
models.TraitDatetime.key, models.TraitDatetime.value,
sa.cast(sa.null(), sa.Integer),
sa.cast(sa.null(), sa.Float(53)),
sa.cast(sa.null(), sa.Text))
sa.cast(sa.null(), sa.String(255)))
).union(
query.join(
models.TraitInt,

View File

@ -15,9 +15,9 @@ import sqlalchemy as sa
from ceilometer.storage.sqlalchemy import models
tables = [('trait_text', sa.Text, True, 't_string', 1),
tables = [('trait_text', sa.String(255), True, 't_string', 1),
('trait_int', sa.Integer, False, 't_int', 2),
('trait_float', sa.Float, False, 't_float', 3),
('trait_float', sa.Float(53), False, 't_float', 3),
('trait_datetime', models.PreciseTimestamp(),
False, 't_datetime', 4)]