fixed stupid postgres error
This commit is contained in:
parent
9dc9705406
commit
4216e11e5b
10 changed files with 13 additions and 77 deletions
6
.idea/sqldialects.xml
generated
Normal file
6
.idea/sqldialects.xml
generated
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="SqlDialectMappings">
|
||||||
|
<file url="PROJECT" dialect="PostgreSQL" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -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';
|
|
||||||
|
|
@ -21,5 +21,3 @@ services:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
env_file:
|
env_file:
|
||||||
- envvars.env
|
- envvars.env
|
||||||
volumes:
|
|
||||||
- ./db_scripts:/docker-entrypoint-initdb.d
|
|
||||||
|
|
@ -19,6 +19,6 @@ class PostFactory(factory.Factory):
|
||||||
tags = Tag.objects.all()[0] if len(Tag.objects.all()) != 0 else None
|
tags = Tag.objects.all()[0] if len(Tag.objects.all()) != 0 else None
|
||||||
if len(Topic.objects.all()) == 0:
|
if len(Topic.objects.all()) == 0:
|
||||||
TopicFactory.create_batch(10)
|
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"
|
mdfile = "/tmp/test.md"
|
||||||
|
|
|
||||||
|
|
@ -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
|
from django.db import migrations, models
|
||||||
import django.db.models.deletion
|
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')),
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
('name', models.CharField(max_length=255)),
|
('name', models.CharField(max_length=255)),
|
||||||
('numbered', models.BooleanField(default=False)),
|
('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(
|
migrations.CreateModel(
|
||||||
|
|
@ -35,8 +35,9 @@ class Migration(migrations.Migration):
|
||||||
('created', models.DateTimeField(auto_now_add=True)),
|
('created', models.DateTimeField(auto_now_add=True)),
|
||||||
('last_modified', models.DateTimeField(auto_now=True)),
|
('last_modified', models.DateTimeField(auto_now=True)),
|
||||||
('title', models.CharField(max_length=255)),
|
('title', models.CharField(max_length=255)),
|
||||||
|
('mdfile', models.CharField(max_length=255)),
|
||||||
('tags', models.ManyToManyField(to='blog.tag')),
|
('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')),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -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'),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -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,
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -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',
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.shortcuts import redirect
|
|
||||||
from django.urls import path, include
|
from django.urls import path, include
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue