diff --git a/cvat/apps/engine/migrations/0009_auto_20180917_1424.py b/cvat/apps/engine/migrations/0009_auto_20180917_1424.py index 675b0b04..a20ec2cf 100644 --- a/cvat/apps/engine/migrations/0009_auto_20180917_1424.py +++ b/cvat/apps/engine/migrations/0009_auto_20180917_1424.py @@ -9,41 +9,162 @@ class Migration(migrations.Migration): ('engine', '0008_auto_20180917_1424'), ] - operations = [ - migrations.RunSQL('ALTER TABLE "engine_objectpath" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_objectpathattributeval" ALTER COLUMN "track_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedbox" ALTER COLUMN "track_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpoints" ALTER COLUMN "track_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolygon" ALTER COLUMN "track_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolyline" ALTER COLUMN "track_id" TYPE bigint;'), - - migrations.RunSQL('ALTER TABLE "engine_trackedbox" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpoints" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolygon" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolyline" ALTER COLUMN "id" TYPE bigint;'), - - migrations.RunSQL('ALTER TABLE "engine_trackedboxattributeval" ALTER COLUMN "box_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpointsattributeval" ALTER COLUMN "points_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolygonattributeval" ALTER COLUMN "polygon_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolylineattributeval" ALTER COLUMN "polyline_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedboxattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpointsattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolygonattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_trackedpolylineattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledbox" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpoints" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpolygon" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpolyline" ALTER COLUMN "id" TYPE bigint;'), - - migrations.RunSQL('ALTER TABLE "engine_labeledboxattributeval" ALTER COLUMN "box_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpointsattributeval" ALTER COLUMN "points_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpolygonattributeval" ALTER COLUMN "polygon_id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpolylineattributeval" ALTER COLUMN "polyline_id" TYPE bigint;'), - - migrations.RunSQL('ALTER TABLE "engine_labeledboxattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpointsattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpolygonattributeval" ALTER COLUMN "id" TYPE bigint;'), - migrations.RunSQL('ALTER TABLE "engine_labeledpolylineattributeval" ALTER COLUMN "id" TYPE bigint;'), + operations = [ + migrations.AlterField( + model_name='labeledbox', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledboxattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledpoints', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledpointsattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledpolygon', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledpolygonattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledpolyline', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='labeledpolylineattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='objectpath', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='objectpathattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedbox', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedboxattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedpoints', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedpointsattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedpolygon', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedpolygonattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedpolyline', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='trackedpolylineattributeval', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='objectpathattributeval', + name='track_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='objectpathattributeval', + name='track_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedpoints', + name='track_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedpolygon', + name='track_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedpolyline', + name='track_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedboxattributeval', + name='box_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedpointsattributeval', + name='points_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedpolygonattributeval', + name='polygon_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='trackedpolylineattributeval', + name='polyline_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='labeledboxattributeval', + name='box_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='labeledpointsattributeval', + name='points_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='labeledpolygonattributeval', + name='polygon_id', + field=models.BigIntegerField(), + ), + migrations.AlterField( + model_name='labeledpolylineattributeval', + name='polyline_id', + field=models.BigIntegerField(), + ), ] diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index a77efd3e..6883018b 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -128,6 +128,7 @@ class AttributeSpec(models.Model): class AttributeVal(models.Model): # TODO: add a validator here to be sure that it corresponds to self.label + id = models.BigAutoField(primary_key=True) spec = models.ForeignKey(AttributeSpec, on_delete=models.CASCADE) value = models.CharField(max_length=64) class Meta: @@ -148,6 +149,7 @@ class Shape(models.Model): abstract = True class BoundingBox(Shape): + id = models.BigAutoField(primary_key=True) xtl = models.FloatField() ytl = models.FloatField() xbr = models.FloatField() @@ -156,6 +158,7 @@ class BoundingBox(Shape): abstract = True class PolyShape(Shape): + id = models.BigAutoField(primary_key=True) points = models.TextField() class Meta: abstract = True @@ -185,6 +188,7 @@ class LabeledPointsAttributeVal(AttributeVal): points = models.ForeignKey(LabeledPoints, on_delete=models.CASCADE) class ObjectPath(Annotation): + id = models.BigAutoField(primary_key=True) shapes = models.CharField(max_length=10, default='boxes') class ObjectPathAttributeVal(AttributeVal):