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

["Magnus Granberg" <zorry@gentoo.org>]

commit:     7792701f588d7c92c019de3924fbdad1d9a8014d
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 06:05:07 2020 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 06:05:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=7792701f

Remove timestamp and deleted on tables keyword, use and restrictions

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

 gosbs/db/sqlalchemy/models.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --cc gosbs/db/sqlalchemy/models.py
index 119369c,e4fc530..1c2db00
--- a/gosbs/db/sqlalchemy/models.py
+++ b/gosbs/db/sqlalchemy/models.py
@@@ -15,8 -15,12 +15,17 @@@
  #    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
@@@ -274,7 -278,7 +283,11 @@@ 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__ = (
@@@ -282,7 -286,7 +295,11 @@@
      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__ = (
@@@ -292,7 -296,7 +309,11 @@@
      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__ = (
@@@ -301,7 -305,7 +322,11 @@@
      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__ = (