SQUASHING

This commit is contained in:
Matthew Ryan Dillon 2016-06-15 15:12:34 -07:00
parent 8573b0326b
commit a541a6f301
42 changed files with 588 additions and 1001 deletions

View file

@ -1,26 +1,23 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
import autoslug.fields
class Migration(migrations.Migration):
dependencies = [
('collections_ccdb', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Species',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('common_name', models.CharField(max_length=100)),
('genus', models.CharField(max_length=50, blank=True)),
('species', models.CharField(max_length=50, blank=True)),
('parasite', models.BooleanField(default=False)),
('sort_order', models.IntegerField(blank=True, null=True)),
('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='common_name')),
('slug', autoslug.fields.AutoSlugField(populate_from='common_name', editable=False)),
],
options={
'ordering': ['sort_order'],
@ -31,4 +28,56 @@ class Migration(migrations.Migration):
name='species',
unique_together=set([('common_name', 'species')]),
),
migrations.CreateModel(
name='TrapSpecies',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('sex', models.CharField(max_length=25, blank=True)),
('count', models.IntegerField(blank=True, null=True)),
('count_estimated', models.BooleanField(default=False)),
('collection_trap', models.ForeignKey(to='collections_ccdb.CollectionTrap')),
('species', models.ForeignKey(to='species.Species')),
],
options={
'verbose_name_plural': 'trap-species',
},
),
migrations.CreateModel(
name='CollectionSpecies',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('sex', models.CharField(max_length=25, blank=True)),
('count', models.IntegerField(blank=True, null=True)),
('count_estimated', models.BooleanField(default=False)),
('collection', models.ForeignKey(to='collections_ccdb.Collection')),
('species', models.ForeignKey(to='species.Species')),
],
options={
'verbose_name_plural': 'collection-species',
},
),
migrations.AlterUniqueTogether(
name='collectionspecies',
unique_together=set([('collection', 'species')]),
),
migrations.AlterField(
model_name='collectionspecies',
name='collection',
field=models.ForeignKey(to='collections_ccdb.Collection', related_name='collection_species'),
),
migrations.AlterField(
model_name='collectionspecies',
name='species',
field=models.ForeignKey(to='species.Species', related_name='collection_species'),
),
migrations.AlterField(
model_name='trapspecies',
name='collection_trap',
field=models.ForeignKey(to='collections_ccdb.CollectionTrap', related_name='trap_species'),
),
migrations.AlterField(
model_name='trapspecies',
name='species',
field=models.ForeignKey(to='species.Species', related_name='trap_species'),
),
]

View file

@ -27,12 +27,14 @@ class Migration(migrations.Migration):
else:
print('species', r[0:], form.errors.as_data())
def rollback(apps, schema_editor):
Species = apps.get_model('species', 'Species')
Species.objects.all().delete()
dependencies = [
('species', '0003_collectionspecies'),
('species', '0001_initial'),
('locations', '0002_DATA_initial'),
]
operations = [

View file

@ -1,29 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('collections_ccdb', '0001_initial'),
('species', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='TrapSpecies',
fields=[
('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
('sex', models.CharField(blank=True, max_length=25)),
('count', models.IntegerField(blank=True, null=True)),
('count_estimated', models.BooleanField(default=False)),
('collection_trap', models.ForeignKey(to='collections_ccdb.CollectionTrap')),
('species', models.ForeignKey(to='species.Species')),
],
options={
'verbose_name_plural': 'trap-species',
},
),
]

View file

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('collections_ccdb', '0001_initial'),
('species', '0002_trapspecies'),
]
operations = [
migrations.CreateModel(
name='CollectionSpecies',
fields=[
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)),
('sex', models.CharField(blank=True, max_length=25)),
('count', models.IntegerField(null=True, blank=True)),
('count_estimated', models.BooleanField(default=False)),
('collection', models.ForeignKey(to='collections_ccdb.Collection')),
('species', models.ForeignKey(to='species.Species')),
],
options={
'verbose_name_plural': 'collection-species',
},
),
migrations.AlterUniqueTogether(
name='collectionspecies',
unique_together=set([('collection', 'species')]),
),
]

View file

@ -1,41 +0,0 @@
from django.db import migrations
from django.forms import modelform_factory
from ccdb.utils.data import get_data_sources
class Migration(migrations.Migration):
def migrate(apps, schema_editor):
sources = get_data_sources()
if not sources:
return
c = sources['db0']
CollectionSpecies = apps.get_model('species', 'CollectionSpecies')
CollectionSpecies.objects.all().delete()
CollectionSpeciesForm = modelform_factory(CollectionSpecies, fields='__all__')
for r in c.execute('SELECT * FROM tbl_hash_collection_species;'):
form = CollectionSpeciesForm(dict(collection=r[0], species=r[1], sex=r[2],
count=r[3], count_estimated=r[4]))
if form.is_valid():
# No PK in Andre's file
form.save()
else:
print('collection species', r[0:], form.errors.as_data())
def rollback(apps, schema_editor):
CollectionSpecies = apps.get_model('species', 'CollectionSpecies')
CollectionSpecies.objects.all().delete()
dependencies = [
('species', '0004_DATA_initial'),
('collections_ccdb', '0005_DATA_initial'),
]
operations = [
migrations.RunPython(migrate, rollback),
]

View file

@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('species', '0005_DATA_species_collection'),
]
operations = [
migrations.AlterField(
model_name='collectionspecies',
name='collection',
field=models.ForeignKey(related_name='collection_species', to='collections_ccdb.Collection'),
),
migrations.AlterField(
model_name='collectionspecies',
name='species',
field=models.ForeignKey(related_name='collection_species', to='species.Species'),
),
migrations.AlterField(
model_name='trapspecies',
name='collection_trap',
field=models.ForeignKey(related_name='trap_species', to='collections_ccdb.CollectionTrap'),
),
migrations.AlterField(
model_name='trapspecies',
name='species',
field=models.ForeignKey(related_name='trap_species', to='species.Species'),
),
]