diff --git a/apps/transfer/models.py b/apps/transfer/models.py index caab0321..e661b402 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -648,49 +648,51 @@ class EmailAddresses(MigrateMixin): db_table = 'email_addresses' -# class Reviews(MigrateMixin): -# using = 'legacy' -# -# vintage = models.PositiveIntegerField() -# mark = models.FloatField(blank=True, null=True) -# favorite = models.IntegerField(blank=True, null=True) -# account = models.ForeignKey(Accounts, models.DO_NOTHING, blank=True, null=True) -# establishment = models.ForeignKey(Establishments, models.DO_NOTHING, blank=True, null=True) -# visited_at = models.DateField(blank=True, null=True) -# created_at = models.DateTimeField() -# published_at = models.DateTimeField(blank=True, null=True) -# updated_at = models.DateTimeField() -# aasm_state = models.CharField(max_length=255, blank=True, null=True) -# reviewer_id = models.IntegerField() -# priority = models.IntegerField(blank=True, null=True) -# #TODO: модель Products в postgres закомментирована -# product = models.ForeignKey("Products", models.DO_NOTHING, blank=True, null=True) -# received_at = models.DateTimeField(blank=True, null=True) -# reviewer_name = models.CharField(max_length=255, blank=True, null=True) -# type = models.CharField(max_length=255, blank=True, null=True) -# locked = models.IntegerField(blank=True, null=True) -# temporary = models.IntegerField(blank=True, null=True) -# last_state_change_at = models.DateTimeField(blank=True, null=True) -# editor = models.ForeignKey(Accounts, models.DO_NOTHING, blank=True, null=True) -# -# class Meta: -# managed = False -# db_table = 'reviews' -# +class Reviews(MigrateMixin): + using = 'legacy' -# class ReviewTexts(MigrateMixin): -# using = 'legacy' -# -# review = models.ForeignKey('Reviews', models.DO_NOTHING, blank=True, null=True) -# locale = models.CharField(max_length=5, blank=True, null=True) -# text = models.TextField(blank=True, null=True) -# updated_by = models.ForeignKey(Accounts, models.DO_NOTHING, db_column='updated_by', blank=True, null=True) -# created_at = models.DateTimeField() -# updated_at = models.DateTimeField() -# -# class Meta: -# managed = False -# db_table = 'review_texts' + vintage = models.PositiveIntegerField() + mark = models.FloatField(blank=True, null=True) + favorite = models.IntegerField(blank=True, null=True) + # account = models.ForeignKey(Accounts, models.DO_NOTHING, blank=True, null=True, related_name="account_reviews") + account_id = models.IntegerField(blank=True, null=True) + establishment = models.ForeignKey(Establishments, models.DO_NOTHING, blank=True, null=True) + visited_at = models.DateField(blank=True, null=True) + created_at = models.DateTimeField() + published_at = models.DateTimeField(blank=True, null=True) + updated_at = models.DateTimeField() + aasm_state = models.CharField(max_length=255, blank=True, null=True) + reviewer_id = models.IntegerField() + priority = models.IntegerField(blank=True, null=True) + #TODO: модель Products в postgres закомментирована + # product = models.ForeignKey("Products", models.DO_NOTHING, blank=True, null=True) + received_at = models.DateTimeField(blank=True, null=True) + reviewer_name = models.CharField(max_length=255, blank=True, null=True) + type = models.CharField(max_length=255, blank=True, null=True) + locked = models.IntegerField(blank=True, null=True) + temporary = models.IntegerField(blank=True, null=True) + last_state_change_at = models.DateTimeField(blank=True, null=True) + # editor = models.ForeignKey(Accounts, models.DO_NOTHING, blank=True, null=True, related_name="editor_reviews") + + class Meta: + managed = False + db_table = 'reviews' + + +class ReviewTexts(MigrateMixin): + using = 'legacy' + + # review = models.ForeignKey('Reviews', models.DO_NOTHING, blank=True, null=True) + review_id = models.IntegerField(blank=True, null=True) + locale = models.CharField(max_length=5, blank=True, null=True) + text = models.TextField(blank=True, null=True) + updated_by = models.ForeignKey(Accounts, models.DO_NOTHING, db_column='updated_by', blank=True, null=True) + created_at = models.DateTimeField() + updated_at = models.DateTimeField() + + class Meta: + managed = False + db_table = 'review_texts' class Comments(MigrateMixin): using = 'legacy' @@ -748,7 +750,8 @@ class PageTexts(MigrateMixin): body = models.TextField(blank=True, null=True) locale = models.CharField(max_length=255, blank=True, null=True) state = models.CharField(max_length=255, blank=True, null=True) - page = models.ForeignKey(Pages, models.DO_NOTHING, blank=True, null=True) + # page = models.ForeignKey(Pages, models.DO_NOTHING, blank=True, null=True) + page_id = models.IntegerField(blank=True, null=True) created_at = models.DateTimeField() updated_at = models.DateTimeField() summary = models.TextField(blank=True, null=True) diff --git a/project/settings/base.py b/project/settings/base.py index 509b9b14..dd6c52cc 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -152,7 +152,8 @@ DATABASES = { }, 'legacy': { 'ENGINE': 'django.db.backends.mysql', - 'HOST': '172.23.0.1', + # 'HOST': '172.23.0.1', + 'HOST': '172.17.0.1', 'PORT': 3306, 'NAME': 'dev', 'USER': 'dev',