x/tuskar
Code Issues Proposed changes

Changed the storage SQLAlchemy model to use Text

Browse Source 
The contents property on StoredFiles shouldn't have a length, under
MySQL the String type requires a length but Text doesn't and is thus
a better fit.

Closes-bug: #1365848
Change-Id: Ib91cabe72026d13587d48b4451013d2b3528e96c
This commit is contained in:
Dougal Matthews 2014-09-09 10:47:05 +01:00
parent ea838d2980
commit a3575e3189
2 changed files with 3 additions and 3 deletions
tuskar/db/sqlalchemy
migrate_repo/versions
002_add_stored_file.py
models.py

4
tuskar/db/sqlalchemy/migrate_repo/versions/002_add_stored_file.py

@ -11,7 +11,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from sqlalchemy import Column, DateTime, Integer, MetaData, String, Table from sqlalchemy import Column, DateTime, Integer, MetaData, String, Table, Text
from tuskar.openstack.common.gettextutils import _ # noqa from tuskar.openstack.common.gettextutils import _ # noqa
from tuskar.openstack.common import log as logging from tuskar.openstack.common import log as logging
@ -31,7 +31,7 @@ def upgrade(migrate_engine):
'stored_file', 'stored_file',
meta, meta,
Column('uuid', String(length=36), primary_key=True, nullable=False), Column('uuid', String(length=36), primary_key=True, nullable=False),
Column('contents', String(), nullable=False), Column('contents', Text(), nullable=False),
Column('object_type', String(length=20), nullable=False), Column('object_type', String(length=20), nullable=False),
Column('name', String(length=64), nullable=True), Column('name', String(length=64), nullable=True),
Column('version', Integer(), nullable=True), Column('version', Integer(), nullable=True),

2
tuskar/db/sqlalchemy/models.py

@ -225,7 +225,7 @@ class StoredFile(Base):
uuid = Column(String(length=36), primary_key=True) uuid = Column(String(length=36), primary_key=True)
#: contents contains the full file contents as a string. #: contents contains the full file contents as a string.
contents = Column(String(), nullable=False) contents = Column(Text(), nullable=False)
#: Object type flags the type of file that this is, i.e. template or #: Object type flags the type of file that this is, i.e. template or
#: environment file. #: environment file.