merge migrations

This commit is contained in:
alex 2019-10-30 20:15:19 +03:00
parent d344aeeeef
commit 7e503f617e
4 changed files with 83 additions and 41 deletions

View File

@ -0,0 +1,14 @@
# Generated by Django 2.2.4 on 2019-10-30 17:14
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('establishment', '0046_merge_20191030_1618'),
('establishment', '0046_merge_20191030_0858'),
]
operations = [
]

View File

@ -0,0 +1,14 @@
# Generated by Django 2.2.4 on 2019-10-30 17:14
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('location', '0019_merge_20191030_0858'),
('location', '0019_merge_20191030_1618'),
]
operations = [
]

View File

@ -0,0 +1,14 @@
# Generated by Django 2.2.4 on 2019-10-30 17:14
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('news', '0033_merge_20191030_1618'),
('news', '0032_merge_20191030_0858'),
]
operations = [
]

View File

@ -897,44 +897,44 @@ class KeyValueMetadatumKeyValueMetadatumEstablishments(MigrateMixin):
db_table = 'key_value_metadatum_key_value_metadatum_establishments' db_table = 'key_value_metadatum_key_value_metadatum_establishments'
class Products(models.Model): # class Products(models.Model):
establishment = models.ForeignKey('Establishments', models.DO_NOTHING, blank=True, null=True) # establishment = models.ForeignKey('Establishments', models.DO_NOTHING, blank=True, null=True)
brand = models.CharField(max_length=255, blank=True, null=True) # brand = models.CharField(max_length=255, blank=True, null=True)
name = models.CharField(max_length=255, blank=True, null=True) # name = models.CharField(max_length=255, blank=True, null=True)
vintage = models.CharField(max_length=255, blank=True, null=True) # vintage = models.CharField(max_length=255, blank=True, null=True)
type = models.CharField(max_length=255, blank=True, null=True) # type = models.CharField(max_length=255, blank=True, null=True)
unique_key = models.CharField(max_length=255, blank=True, null=True) # unique_key = models.CharField(max_length=255, blank=True, null=True)
price = models.FloatField(blank=True, null=True) # price = models.FloatField(blank=True, null=True)
average_price_in_shops = models.FloatField(blank=True, null=True) # average_price_in_shops = models.FloatField(blank=True, null=True)
fra_encima_id = models.IntegerField(blank=True, null=True) # fra_encima_id = models.IntegerField(blank=True, null=True)
wine_sub_region_id = models.IntegerField(blank=True, null=True) # wine_sub_region_id = models.IntegerField(blank=True, null=True)
classification = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True) # classification = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True)
wine_region = models.ForeignKey('WineLocations', models.DO_NOTHING, blank=True, null=True) # wine_region = models.ForeignKey('WineLocations', models.DO_NOTHING, blank=True, null=True)
wine_type = models.ForeignKey('WineTypes', models.DO_NOTHING, blank=True, null=True) # wine_type = models.ForeignKey('WineTypes', models.DO_NOTHING, blank=True, null=True)
wine_color = models.ForeignKey('WineColors', models.DO_NOTHING, blank=True, null=True) # wine_color = models.ForeignKey('WineColors', models.DO_NOTHING, blank=True, null=True)
appellation = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True) # appellation = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True)
created_at = models.DateTimeField() # created_at = models.DateTimeField()
updated_at = models.DateTimeField() # updated_at = models.DateTimeField()
state = models.CharField(max_length=255, blank=True, null=True) # state = models.CharField(max_length=255, blank=True, null=True)
wine_style = models.ForeignKey('WineStyles', models.DO_NOTHING, blank=True, null=True) # wine_style = models.ForeignKey('WineStyles', models.DO_NOTHING, blank=True, null=True)
village = models.ForeignKey('WineLocations', models.DO_NOTHING, blank=True, null=True) # village = models.ForeignKey('WineLocations', models.DO_NOTHING, blank=True, null=True)
vineyard = models.ForeignKey('WineLocations', models.DO_NOTHING, blank=True, null=True) # vineyard = models.ForeignKey('WineLocations', models.DO_NOTHING, blank=True, null=True)
yard_classification = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True) # yard_classification = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True)
wine_quality = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True) # wine_quality = models.ForeignKey('WineClassifications', models.DO_NOTHING, blank=True, null=True)
bottles_produced = models.CharField(max_length=3000, blank=True, null=True) # bottles_produced = models.CharField(max_length=3000, blank=True, null=True)
deu_import_id = models.IntegerField(blank=True, null=True) # deu_import_id = models.IntegerField(blank=True, null=True)
#
class Meta: # class Meta:
managed = False # managed = False
db_table = 'products' # db_table = 'products'
#
#
class WineTypes(models.Model): # class WineTypes(models.Model):
name = models.CharField(max_length=255, blank=True, null=True) # name = models.CharField(max_length=255, blank=True, null=True)
fra_encima_id = models.IntegerField(blank=True, null=True) # fra_encima_id = models.IntegerField(blank=True, null=True)
created_at = models.DateTimeField() # created_at = models.DateTimeField()
updated_at = models.DateTimeField() # updated_at = models.DateTimeField()
#
class Meta: # class Meta:
managed = False # managed = False
db_table = 'wine_types' # db_table = 'wine_types'