File 0001-Reflect-real-database-field-type-in-model.patch of Package openstack-manila

From 8202af0d1d6796d3b6a562b2ce4ce5baa2a70232 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 12 Mar 2015 14:12:53 +0100
Subject: [PATCH] Reflect real database field type in model

In the database, the deleted field for the VolumesTypes class is a
character field (not an Integer). The migrations create it as an
character field (which is the correct behavior because a
uuid is stored in that if deleted).

Change-Id: Iba071294755c5b0bdd53ad25850eb7374c1f2064
Closes-Bug: #1431335
---
 manila/db/sqlalchemy/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manila/db/sqlalchemy/models.py b/manila/db/sqlalchemy/models.py
index 8e778d7..0eb8968 100644
--- a/manila/db/sqlalchemy/models.py
+++ b/manila/db/sqlalchemy/models.py
@@ -206,13 +206,14 @@ class VolumeTypes(BASE, ManilaBase):
     """Represent possible volume_types of volumes offered."""
     __tablename__ = "volume_types"
     id = Column(String(36), primary_key=True)
+    deleted = Column(String(36), default='False')
     name = Column(String(255))
     shares = relationship(Share,
                           backref=backref('volume_type', uselist=False),
                           foreign_keys=id,
                           primaryjoin='and_('
                           'Share.volume_type_id == VolumeTypes.id, '
-                          'VolumeTypes.deleted == False)')
+                          'VolumeTypes.deleted == "False")')
 
 
 class VolumeTypeExtraSpecs(BASE, ManilaBase):
-- 
2.3.1