From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0EFCF138350 for ; Thu, 9 Apr 2020 06:05:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4425CE0A8E; Thu, 9 Apr 2020 06:05:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C655E0A8E for ; Thu, 9 Apr 2020 06:05:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C83FC34F00E for ; Thu, 9 Apr 2020 06:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE0CF1C8 for ; Thu, 9 Apr 2020 06:05:37 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1586412307.7792701f588d7c92c019de3924fbdad1d9a8014d.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: / X-VCS-Repository: proj/tinderbox-cluster X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 7792701f588d7c92c019de3924fbdad1d9a8014d X-VCS-Branch: master Date: Thu, 9 Apr 2020 06:05:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b928db42-b011-4c11-bf5f-0cc9f6b15164 X-Archives-Hash: 352ff9993b7043d0b77dd5ed6a7f5456 commit: 7792701f588d7c92c019de3924fbdad1d9a8014d Author: Magnus Granberg gentoo org> AuthorDate: Thu Apr 9 06:05:07 2020 +0000 Commit: Magnus Granberg gentoo 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 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__ = (