thermokarst/ccdb-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up unique on existing models

Browse source
This commit is contained in:
Matthew Ryan Dillon 2016-06-16 06:45:59 -07:00
parent a44ac2fa81
commit 49eacdeef4
16 changed files with 141 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ccdb/collections_ccdb/migrations/0001_initial.py
View file

@ -13,7 +13,7 @@ class Migration(migrations.Migration):
name='ADFGPermit',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),
('name', models.CharField(max_length=200)),
('name', models.CharField(max_length=200, unique=True)),
('sort_order', models.IntegerField(blank=True, null=True)),
],
options={
@ -82,7 +82,7 @@ class Migration(migrations.Migration):
name='Flaw',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),
('name', models.CharField(max_length=200)),
('name', models.CharField(max_length=200, unique=True)),
('description', models.CharField(blank=True, max_length=255)),
('sort_order', models.IntegerField(blank=True, null=True)),
],

4
ccdb/collections_ccdb/models.py
View file

@ -29,7 +29,7 @@ class CollectionMethod(models.Model):
class Flaw(models.Model):
name = models.CharField(max_length=200)
name = models.CharField(max_length=200, unique=True)
description = models.CharField(max_length=255, blank=True)
sort_order = models.IntegerField(blank=True, null=True)
@ -41,7 +41,7 @@ class Flaw(models.Model):
class ADFGPermit(models.Model):
name = models.CharField(max_length=200)
name = models.CharField(max_length=200, unique=True)
sort_order = models.IntegerField(blank=True, null=True)
def __str__(self):

14
ccdb/collections_ccdb/tests/test_models.py
View file

@ -42,6 +42,13 @@ class FlawTestCase(TestCase):
self.assertTrue(isinstance(f, Flaw))
self.assertEqual(f.__str__(), f.name)
def test_uniqueness(self):
f1 = FlawFactory()
with transaction.atomic(), self.assertRaises(IntegrityError):
FlawFactory(name=f1.name)
f3 = FlawFactory()
self.assertTrue(isinstance(f3, Flaw))
class ADFGPermitTestCase(TestCase):
def test_creation(self):
@ -49,6 +56,13 @@ class ADFGPermitTestCase(TestCase):
self.assertTrue(isinstance(a, ADFGPermit))
self.assertEqual(a.__str__(), a.name)
def test_uniqueness(self):
a1 = ADFGPermitFactory()
with transaction.atomic(), self.assertRaises(IntegrityError):
ADFGPermitFactory(name=a1.name)
a3 = ADFGPermitFactory()
self.assertTrue(isinstance(a3, ADFGPermit))
class CollectionTestCase(TestCase):
def test_creation(self):