Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-25 04:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge migrations paths

Browse source
This commit is contained in:
Adickes 2016-03-01 19:56:44 -05:00
parent ea5d443631
commit effe512e61
8 changed files with 1137 additions and 3320 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1127
commands.txt Normal file
View file

File diff suppressed because it is too large Load diff

3130
pokemon_v2/migrations/0001_squashed_0002_auto_20151228_0417.py
View file

File diff suppressed because it is too large Load diff

20
pokemon_v2/migrations/0001_squashed_0006_pokemonformsprites.py → pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py
View file

@ -6,10 +6,10 @@ from django.db import models, migrations
class Migration(migrations.Migration):
replaces = [(b'pokemon_v2', '0001_squashed_0003_auto_20151119_1409'), (b'pokemon_v2', '0002_pokemonimageset'), (b'pokemon_v2', '0003_auto_20160128_0523'), (b'pokemon_v2', '0004_pokemonsprites'), (b'pokemon_v2', '0005_auto_20160214_1651'), (b'pokemon_v2', '0006_pokemonformsprites')]
# replaces = [(b'pokemon_v2', '0001_squashed_0006_pokemonformsprites'), (b'pokemon_v2', '0002_auto_20160301_1408')]
dependencies = [
]
# dependencies = [
# ]
operations = [
migrations.CreateModel(
@ -2862,7 +2862,7 @@ class Migration(migrations.Migration):
name='AbilityChangeEffectText',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
('ability_change', models.ForeignKey(related_name='abilitychangeeffecttext', blank=True, to='pokemon_v2.AbilityChange', null=True)),
('language', models.ForeignKey(related_name='abilitychangeeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
],
@ -2875,7 +2875,7 @@ class Migration(migrations.Migration):
name='AbilityEffectText',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
('short_effect', models.CharField(max_length=300)),
('ability', models.ForeignKey(related_name='abilityeffecttext', blank=True, to='pokemon_v2.Ability', null=True)),
('language', models.ForeignKey(related_name='abilityeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
@ -2889,7 +2889,7 @@ class Migration(migrations.Migration):
name='ItemEffectText',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
('short_effect', models.CharField(max_length=300)),
('item', models.ForeignKey(related_name='itemeffecttext', blank=True, to='pokemon_v2.Item', null=True)),
('language', models.ForeignKey(related_name='itemeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
@ -2903,7 +2903,7 @@ class Migration(migrations.Migration):
name='ContestEffectEffectText',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
('contest_effect', models.ForeignKey(related_name='contesteffecteffecttext', blank=True, to='pokemon_v2.ContestEffect', null=True)),
('language', models.ForeignKey(related_name='contesteffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
],
@ -2916,7 +2916,7 @@ class Migration(migrations.Migration):
name='MoveEffectChangeEffectText',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
('language', models.ForeignKey(related_name='moveeffectchangeeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
('move_effect_change', models.ForeignKey(related_name='moveeffectchangeeffecttext', blank=True, to='pokemon_v2.MoveEffectChange', null=True)),
],
@ -2929,7 +2929,7 @@ class Migration(migrations.Migration):
name='MoveEffectEffectText',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
('short_effect', models.CharField(max_length=300)),
('language', models.ForeignKey(related_name='moveeffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
('move_effect', models.ForeignKey(blank=True, to='pokemon_v2.MoveEffect', null=True)),
@ -3048,7 +3048,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('item_fling_effect', models.ForeignKey(related_name='itemflingeffecteffecttext', blank=True, to='pokemon_v2.ItemFlingEffect', null=True)),
('language', models.ForeignKey(related_name='itemflingeffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
('effect', models.CharField(max_length=4000)),
('effect', models.CharField(max_length=6000)),
],
options={
'abstract': False,

33
pokemon_v2/migrations/0002_pokemonimageset.py
View file

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('pokemon_v2', '0001_squashed_0003_auto_20151119_1409'),
]
operations = [
migrations.CreateModel(
name='PokemonImageSet',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('front_default', models.BooleanField(default=False)),
('front_female', models.BooleanField(default=False)),
('front_shiny', models.BooleanField(default=False)),
('front_shiny_female', models.BooleanField(default=False)),
('back_default', models.BooleanField(default=False)),
('back_female', models.BooleanField(default=False)),
('back_shiny', models.BooleanField(default=False)),
('back_shiny_female', models.BooleanField(default=False)),
('pokemon', models.ForeignKey(related_name='pokemonimageset', blank=True, to='pokemon_v2.Pokemon', null=True)),
],
options={
'abstract': False,
},
bases=(models.Model,),
),
]

62
pokemon_v2/migrations/0003_auto_20160128_0523.py
View file

@ -1,62 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('pokemon_v2', '0002_pokemonimageset'),
]
operations = [
migrations.AlterField(
model_name='pokemonimageset',
name='back_default',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='back_female',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='back_shiny',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='back_shiny_female',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='front_default',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='front_female',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='front_shiny',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='pokemonimageset',
name='front_shiny_female',
field=models.CharField(max_length=200, null=True, blank=True),
preserve_default=True,
),
]

26
pokemon_v2/migrations/0004_pokemonsprites.py
View file

@ -1,26 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('pokemon_v2', '0003_auto_20160128_0523'),
]
operations = [
migrations.CreateModel(
name='PokemonSprites',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('sprites', models.CharField(max_length=500)),
('pokemon', models.ForeignKey(related_name='pokemonsprites', blank=True, to='pokemon_v2.Pokemon', null=True)),
],
options={
'abstract': False,
},
bases=(models.Model,),
),
]

33
pokemon_v2/migrations/0005_auto_20160214_1651.py
View file

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('pokemon_v2', '0004_pokemonsprites'),
]
operations = [
migrations.CreateModel(
name='ItemSprites',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('sprites', models.CharField(max_length=500)),
('item', models.ForeignKey(related_name='itemsprites', blank=True, to='pokemon_v2.Item', null=True)),
],
options={
'abstract': False,
},
bases=(models.Model,),
),
migrations.RemoveField(
model_name='pokemonimageset',
name='pokemon',
),
migrations.DeleteModel(
name='PokemonImageSet',
),
]

26
pokemon_v2/migrations/0006_pokemonformsprites.py
View file

@ -1,26 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('pokemon_v2', '0005_auto_20160214_1651'),
]
operations = [
migrations.CreateModel(
name='PokemonFormSprites',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('sprites', models.CharField(max_length=500)),
('pokemon_form', models.ForeignKey(related_name='pokemonformsprites', blank=True, to='pokemon_v2.PokemonForm', null=True)),
],
options={
'abstract': False,
},
bases=(models.Model,),
),
]