diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..6df4889 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/db_scripts/init_user_db.sql b/db_scripts/init_user_db.sql deleted file mode 100644 index 9688d6e..0000000 --- a/db_scripts/init_user_db.sql +++ /dev/null @@ -1,7 +0,0 @@ -\set dbuser `echo "$POSTGRES_USER"` -\set dbname `echo "$POSTGRES_DB"` -\set pwd `echo "$POSTGRES_PASSWORD"` - -CREATE USER :dbuser; -CREATE DATABASE :'dbname'; -GRANT ALL PRIVILEGES ON DATABASE :'dbname' TO :'dbuser'; diff --git a/docker-compose.yml b/docker-compose.yml index 79a583c..54f3a55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,4 @@ services: ports: - "5432:5432" env_file: - - envvars.env - volumes: - - ./db_scripts:/docker-entrypoint-initdb.d \ No newline at end of file + - envvars.env \ No newline at end of file diff --git a/envvars.env b/envvars.env index 4f2ec88..657c33c 100644 --- a/envvars.env +++ b/envvars.env @@ -1,3 +1,3 @@ POSTGRES_PASSWORD=Pwp9^SXoD9X%R$A$fCX5 POSTGRES_USER=mainuser -POSTGRES_DB=django_main +POSTGRES_DB=django_main \ No newline at end of file diff --git a/markdownblog/blog/factories.py b/markdownblog/blog/factories.py index f9f6caf..c63c688 100644 --- a/markdownblog/blog/factories.py +++ b/markdownblog/blog/factories.py @@ -19,6 +19,6 @@ class PostFactory(factory.Factory): tags = Tag.objects.all()[0] if len(Tag.objects.all()) != 0 else None if len(Topic.objects.all()) == 0: TopicFactory.create_batch(10) - topics = Topic.objects.all()[0] + topics = Topic.objects.all()[0] if len(Topic.objects.all()) != 0 else None mdfile = "/tmp/test.md" diff --git a/markdownblog/blog/migrations/0001_initial.py b/markdownblog/blog/migrations/0001_initial.py index ac2fd64..b9baaaf 100644 --- a/markdownblog/blog/migrations/0001_initial.py +++ b/markdownblog/blog/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-06-01 08:31 +# Generated by Django 4.0.5 on 2022-06-17 19:51 from django.db import migrations, models import django.db.models.deletion @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255)), ('numbered', models.BooleanField(default=False)), - ('rootTopic', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='blog.topic')), + ('rootTopic', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='blog.topic')), ], ), migrations.CreateModel( @@ -35,8 +35,9 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('last_modified', models.DateTimeField(auto_now=True)), ('title', models.CharField(max_length=255)), + ('mdfile', models.CharField(max_length=255)), ('tags', models.ManyToManyField(to='blog.tag')), - ('topics', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='blog.topic')), + ('topic', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='blog.topic')), ], ), ] diff --git a/markdownblog/blog/migrations/0002_alter_blogpost_topics_alter_topic_roottopic.py b/markdownblog/blog/migrations/0002_alter_blogpost_topics_alter_topic_roottopic.py deleted file mode 100644 index 3f18b5b..0000000 --- a/markdownblog/blog/migrations/0002_alter_blogpost_topics_alter_topic_roottopic.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.0.5 on 2022-06-01 14:09 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('blog', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='blogpost', - name='topics', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='blog.topic'), - ), - migrations.AlterField( - model_name='topic', - name='rootTopic', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='blog.topic'), - ), - ] diff --git a/markdownblog/blog/migrations/0003_blogpost_mdfile.py b/markdownblog/blog/migrations/0003_blogpost_mdfile.py deleted file mode 100644 index 42b79b2..0000000 --- a/markdownblog/blog/migrations/0003_blogpost_mdfile.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0.5 on 2022-06-01 19:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('blog', '0002_alter_blogpost_topics_alter_topic_roottopic'), - ] - - operations = [ - migrations.AddField( - model_name='blogpost', - name='mdfile', - field=models.CharField(default='/tmp/test.md', max_length=255), - preserve_default=False, - ), - ] diff --git a/markdownblog/blog/migrations/0004_rename_topics_blogpost_topic.py b/markdownblog/blog/migrations/0004_rename_topics_blogpost_topic.py deleted file mode 100644 index 1529574..0000000 --- a/markdownblog/blog/migrations/0004_rename_topics_blogpost_topic.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0.5 on 2022-06-01 19:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('blog', '0003_blogpost_mdfile'), - ] - - operations = [ - migrations.RenameField( - model_name='blogpost', - old_name='topics', - new_name='topic', - ), - ] diff --git a/markdownblog/markdownblog/urls.py b/markdownblog/markdownblog/urls.py index a8dd0eb..9e9f6e8 100644 --- a/markdownblog/markdownblog/urls.py +++ b/markdownblog/markdownblog/urls.py @@ -1,5 +1,4 @@ from django.contrib import admin -from django.shortcuts import redirect from django.urls import path, include urlpatterns = [