From 71369bafdbe75654888d651be80d3fce1a144d3d Mon Sep 17 00:00:00 2001 From: Pesach Weinstock Date: Thu, 29 Jan 2015 16:21:10 -0500 Subject: [PATCH] - Moving south migrations into deprecated directory which is still supported by south 1.0+, but will not get in the way of Django 1.7+ built-in migrations. See http://south.readthedocs.org/en/latest/releasenotes/1.0.html#library-migration-path and https://docs.djangoproject.com/en/1.7/topics/migrations/#upgrading-from-south --- dpaste/migrations/0001_initial.py | 94 ++++++------------- dpaste/south_migrations/0001_initial.py | 70 ++++++++++++++ ...snippet_author__del_field_snippet_title.py | 0 ...__del_field_snippet_content_highlighted.py | 0 ...__chg_field_snippet_secret_id__chg_fiel.py | 0 ...pire_type__add_field_snippet_view_count.py | 0 ...0006_auto__add_unique_snippet_secret_id.py | 0 dpaste/south_migrations/__init__.py | 0 8 files changed, 100 insertions(+), 64 deletions(-) create mode 100644 dpaste/south_migrations/0001_initial.py rename dpaste/{migrations => south_migrations}/0002_auto__del_spamword__del_field_snippet_author__del_field_snippet_title.py (100%) rename dpaste/{migrations => south_migrations}/0003_auto__del_field_snippet_content_highlighted.py (100%) rename dpaste/{migrations => south_migrations}/0004_auto__chg_field_snippet_expires__chg_field_snippet_secret_id__chg_fiel.py (100%) rename dpaste/{migrations => south_migrations}/0005_auto__add_field_snippet_expire_type__add_field_snippet_view_count.py (100%) rename dpaste/{migrations => south_migrations}/0006_auto__add_unique_snippet_secret_id.py (100%) create mode 100644 dpaste/south_migrations/__init__.py diff --git a/dpaste/migrations/0001_initial.py b/dpaste/migrations/0001_initial.py index 869fb7c..5bf120f 100644 --- a/dpaste/migrations/0001_initial.py +++ b/dpaste/migrations/0001_initial.py @@ -1,70 +1,36 @@ # -*- coding: utf-8 -*- -import datetime +from __future__ import unicode_literals -from django.db import models -from south.db import db -from south.v2 import SchemaMigration +from django.db import models, migrations -class Migration(SchemaMigration): +class Migration(migrations.Migration): - def forwards(self, orm): - # Adding model 'Snippet' - db.create_table('dpaste_snippet', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('secret_id', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)), - ('author', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('content', self.gf('django.db.models.fields.TextField')()), - ('content_highlighted', self.gf('django.db.models.fields.TextField')(blank=True)), - ('lexer', self.gf('django.db.models.fields.CharField')(default='python', max_length=30)), - ('published', self.gf('django.db.models.fields.DateTimeField')(blank=True)), - ('expires', self.gf('django.db.models.fields.DateTimeField')(blank=True)), - ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, to=orm['dpaste.Snippet'])), - ('lft', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('rght', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('tree_id', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - ('level', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), - )) - db.send_create_signal('dpaste', ['Snippet']) + dependencies = [ + ] - # Adding model 'Spamword' - db.create_table('dpaste_spamword', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('word', self.gf('django.db.models.fields.CharField')(max_length=100)), - )) - db.send_create_signal('dpaste', ['Spamword']) - - def backwards(self, orm): - # Deleting model 'Snippet' - db.delete_table('dpaste_snippet') - - # Deleting model 'Spamword' - db.delete_table('dpaste_spamword') - - models = { - 'dpaste.snippet': { - 'Meta': {'ordering': "('-published',)", 'object_name': 'Snippet'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'content': ('django.db.models.fields.TextField', [], {}), - 'content_highlighted': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'expires': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'lexer': ('django.db.models.fields.CharField', [], {'default': "'python'", 'max_length': '30'}), - 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['dpaste.Snippet']"}), - 'published': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), - 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), - 'secret_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), - 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}) - }, - 'dpaste.spamword': { - 'Meta': {'object_name': 'Spamword'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'word': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['dpaste'] + operations = [ + migrations.CreateModel( + name='Snippet', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('secret_id', models.CharField(max_length=255, unique=True, null=True, verbose_name='Secret ID', blank=True)), + ('content', models.TextField(verbose_name='Content')), + ('lexer', models.CharField(default=b'python', max_length=30, verbose_name='Lexer')), + ('published', models.DateTimeField(auto_now_add=True, verbose_name='Published')), + ('expire_type', models.PositiveSmallIntegerField(default=1, verbose_name='Expire Type', choices=[(1, 'Expire by timestamp'), (2, 'Keep Forever'), (3, 'One-Time snippet')])), + ('expires', models.DateTimeField(null=True, verbose_name='Expires', blank=True)), + ('view_count', models.PositiveIntegerField(default=0, verbose_name='View count')), + ('lft', models.PositiveIntegerField(editable=False, db_index=True)), + ('rght', models.PositiveIntegerField(editable=False, db_index=True)), + ('tree_id', models.PositiveIntegerField(editable=False, db_index=True)), + ('level', models.PositiveIntegerField(editable=False, db_index=True)), + ('parent', models.ForeignKey(related_name='children', blank=True, to='dpaste.Snippet', null=True)), + ], + options={ + 'ordering': ('-published',), + 'db_table': 'dpaste_snippet', + }, + bases=(models.Model,), + ), + ] diff --git a/dpaste/south_migrations/0001_initial.py b/dpaste/south_migrations/0001_initial.py new file mode 100644 index 0000000..869fb7c --- /dev/null +++ b/dpaste/south_migrations/0001_initial.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +import datetime + +from django.db import models +from south.db import db +from south.v2 import SchemaMigration + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'Snippet' + db.create_table('dpaste_snippet', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('secret_id', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('title', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)), + ('author', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), + ('content', self.gf('django.db.models.fields.TextField')()), + ('content_highlighted', self.gf('django.db.models.fields.TextField')(blank=True)), + ('lexer', self.gf('django.db.models.fields.CharField')(default='python', max_length=30)), + ('published', self.gf('django.db.models.fields.DateTimeField')(blank=True)), + ('expires', self.gf('django.db.models.fields.DateTimeField')(blank=True)), + ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, to=orm['dpaste.Snippet'])), + ('lft', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), + ('rght', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), + ('tree_id', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), + ('level', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)), + )) + db.send_create_signal('dpaste', ['Snippet']) + + # Adding model 'Spamword' + db.create_table('dpaste_spamword', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('word', self.gf('django.db.models.fields.CharField')(max_length=100)), + )) + db.send_create_signal('dpaste', ['Spamword']) + + def backwards(self, orm): + # Deleting model 'Snippet' + db.delete_table('dpaste_snippet') + + # Deleting model 'Spamword' + db.delete_table('dpaste_spamword') + + models = { + 'dpaste.snippet': { + 'Meta': {'ordering': "('-published',)", 'object_name': 'Snippet'}, + 'author': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'content_highlighted': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'lexer': ('django.db.models.fields.CharField', [], {'default': "'python'", 'max_length': '30'}), + 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['dpaste.Snippet']"}), + 'published': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), + 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'secret_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}) + }, + 'dpaste.spamword': { + 'Meta': {'object_name': 'Spamword'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'word': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['dpaste'] diff --git a/dpaste/migrations/0002_auto__del_spamword__del_field_snippet_author__del_field_snippet_title.py b/dpaste/south_migrations/0002_auto__del_spamword__del_field_snippet_author__del_field_snippet_title.py similarity index 100% rename from dpaste/migrations/0002_auto__del_spamword__del_field_snippet_author__del_field_snippet_title.py rename to dpaste/south_migrations/0002_auto__del_spamword__del_field_snippet_author__del_field_snippet_title.py diff --git a/dpaste/migrations/0003_auto__del_field_snippet_content_highlighted.py b/dpaste/south_migrations/0003_auto__del_field_snippet_content_highlighted.py similarity index 100% rename from dpaste/migrations/0003_auto__del_field_snippet_content_highlighted.py rename to dpaste/south_migrations/0003_auto__del_field_snippet_content_highlighted.py diff --git a/dpaste/migrations/0004_auto__chg_field_snippet_expires__chg_field_snippet_secret_id__chg_fiel.py b/dpaste/south_migrations/0004_auto__chg_field_snippet_expires__chg_field_snippet_secret_id__chg_fiel.py similarity index 100% rename from dpaste/migrations/0004_auto__chg_field_snippet_expires__chg_field_snippet_secret_id__chg_fiel.py rename to dpaste/south_migrations/0004_auto__chg_field_snippet_expires__chg_field_snippet_secret_id__chg_fiel.py diff --git a/dpaste/migrations/0005_auto__add_field_snippet_expire_type__add_field_snippet_view_count.py b/dpaste/south_migrations/0005_auto__add_field_snippet_expire_type__add_field_snippet_view_count.py similarity index 100% rename from dpaste/migrations/0005_auto__add_field_snippet_expire_type__add_field_snippet_view_count.py rename to dpaste/south_migrations/0005_auto__add_field_snippet_expire_type__add_field_snippet_view_count.py diff --git a/dpaste/migrations/0006_auto__add_unique_snippet_secret_id.py b/dpaste/south_migrations/0006_auto__add_unique_snippet_secret_id.py similarity index 100% rename from dpaste/migrations/0006_auto__add_unique_snippet_secret_id.py rename to dpaste/south_migrations/0006_auto__add_unique_snippet_secret_id.py diff --git a/dpaste/south_migrations/__init__.py b/dpaste/south_migrations/__init__.py new file mode 100644 index 0000000..e69de29