[copr] master: Drop the chroots column from copr table (6cd4e17)

bkabrda at fedoraproject.org bkabrda at fedoraproject.org
Tue Jan 15 11:06:14 UTC 2013


Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : master

>---------------------------------------------------------------

commit 6cd4e17ac9c873914491025268eb2896ba43400d
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jan 14 13:33:34 2013 +0100

    Drop the chroots column from copr table


>---------------------------------------------------------------

 .../versions/2fa80e062525_add_mock_chroots.py      |   17 +++++++++++++++++
 coprs_frontend/coprs/models.py                     |   13 +------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py b/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py
index a6e3780..7d77a35 100644
--- a/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py
+++ b/coprs_frontend/alembic/versions/2fa80e062525_add_mock_chroots.py
@@ -31,11 +31,28 @@ def upgrade():
     sa.ForeignKeyConstraint(['mock_chroot_id'], ['mock_chroot.id'], ),
     sa.PrimaryKeyConstraint('mock_chroot_id', 'copr_id')
     )
+    if op.get_bind().dialect.name == 'sqlite':
+        op.rename_table('copr', 'copr_1')
+        op.create_table('copr',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('repos', sa.Text(), nullable=True),
+        sa.Column('created_on', sa.Integer(), nullable=True),
+        sa.Column('build_count', sa.Integer(), nullable=True),
+        sa.Column('owner_id', sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(['owner_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id')
+        )
+        op.execute('INSERT INTO copr SELECT id,name,repos,created_on,build_count,owner_id FROM copr_1')
+        op.drop_table('copr_1')
+    else:
+        op.drop_column('copr', u'chroots')
     ### end Alembic commands ###
 
 
 def downgrade():
     ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('copr', sa.Column(u'chroots', sa.TEXT(), nullable=False))
     op.drop_table('copr_chroot')
     op.drop_table('mock_chroot')
     ### end Alembic commands ###
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index 120cf15..746a410 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -102,7 +102,6 @@ class User(db.Model, Serializer):
 class Copr(db.Model, Serializer):
     id = db.Column(db.Integer, primary_key = True)
     name = db.Column(db.String(100), nullable = False)
-    chroots = db.Column(db.Text, nullable = False)
     repos = db.Column(db.Text)
     created_on = db.Column(db.Integer)
     # duplicate information, but speeds up a lot and makes queries simpler
@@ -118,17 +117,7 @@ class Copr(db.Model, Serializer):
 
     @property
     def chroots_list(self):
-        return self.chroots.split(' ')
-
-    # These two properties help the wtform while getting data from a copr object
-    @property
-    def release(self):
-        return '-'.join(self.chroots_list[0].split('-')[0:-1])
-
-    @property
-    def arches(self):
-        x = [chroot.split('-')[-1] for chroot in self.chroots_list]
-        return x
+        return None #TODO
 
     __mapper_args__ = {'order_by': id.desc()}
 



More information about the copr-devel mailing list