[gentoo-commits] proj/tinderbox-cluster:master commit in: gosbs/db/sqlalchemy/

[gentoo-commits] proj/tinderbox-cluster:master commit in: gosbs/db/sqlalchemy/

[Magnus Granberg]

commit:     cffb0ee84fd7b642b351380592ce490dfc011a08
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 14:02:22 2020 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 14:02:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=cffb0ee8

Redon remove timestamp and deleted on tables keyword, use and restrictions

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 gosbs/db/sqlalchemy/models.py | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/gosbs/db/sqlalchemy/models.py b/gosbs/db/sqlalchemy/models.py
index 1c2db00..be3e48f 100644
--- a/gosbs/db/sqlalchemy/models.py
+++ b/gosbs/db/sqlalchemy/models.py
@@ -15,17 +15,12 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-<<<<<<< HEAD
-"""
-SQLAlchemy models for nova data.
-=======
 
 # Origin https://github.com/openstack/nova/blob/master/nova/db/sqlalchemy/models.py
 # Only small part is left from the origin
 
 """
 SQLAlchemy models for gosbs data.
->>>>>>> be80f7418991180567f0882902ca4151a635e42d
 """
 
 import uuid
@@ -283,11 +278,7 @@ class PackagesEmails(BASE, NovaBase):
                 default=lambda: str(uuid.uuid4()))
     email_id = Column(Integer, ForeignKey('emails.id'))
 
-<<<<<<< HEAD
 class Emails(BASE, NovaBase):
-=======
-class Emails(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
->>>>>>> be80f7418991180567f0882902ca4151a635e42d
     """Represents an image in the datastore."""
     __tablename__ = 'emails'
     __table_args__ = (
@@ -295,11 +286,7 @@ class Emails(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
     id = Column(Integer, primary_key=True)
     email = Column(String(255))
 
-<<<<<<< HEAD
 class Uses(BASE, NovaBase):
-=======
-class Uses(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
->>>>>>> be80f7418991180567f0882902ca4151a635e42d
     """Represents an image in the datastore."""
     __tablename__ = 'uses'
     __table_args__ = (
@@ -309,11 +296,7 @@ class Uses(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
     flag = Column(String(255))
     description = Column(Text)
 
-<<<<<<< HEAD
 class Restrictions(BASE, NovaBase):
-=======
-class Restrictions(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
->>>>>>> be80f7418991180567f0882902ca4151a635e42d
     """Represents an image in the datastore."""
     __tablename__ = 'restrictions'
     __table_args__ = (
@@ -322,11 +305,7 @@ class Restrictions(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin
     id = Column(Integer, primary_key=True)
     restriction = Column(String(255))
     
-<<<<<<< HEAD
 class Keywords(BASE, NovaBase):
-=======
-class Keywords(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
->>>>>>> be80f7418991180567f0882902ca4151a635e42d
     """Represents an image in the datastore."""
     __tablename__ = 'keywords'
     __table_args__ = (