From 189e59ba2e36b3c88346de37e0ad32dfdff6aa13 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 20 Nov 2015 11:32:47 +0100
Subject: [PATCH] Fix previous commit

Django wasn't initialized, this lead to exception when filtering with
foreign key.
Also fixing foreign column name "conf" in "Measure". And changing
initialization to use class names for foreign key columns.
---
 scripts/database/__init__.py |  3 +++
 scripts/database/models.py   | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/database/__init__.py b/scripts/database/__init__.py
index c67d001..cd83541 100644
--- a/scripts/database/__init__.py
+++ b/scripts/database/__init__.py
@@ -2,3 +2,6 @@ import os
 import sys
 from .settings import *
 from .models import *
+
+import django
+django.setup()
diff --git a/scripts/database/models.py b/scripts/database/models.py
index d9b5fdd..5a6fd4c 100644
--- a/scripts/database/models.py
+++ b/scripts/database/models.py
@@ -3,40 +3,45 @@ import sys
 from django.db import models
 
 class ToolsGit(models.Model):
+    id = models.AutoField(primary_key=True)
     git_describe = models.TextField()
     git_commit = models.TextField()
     class Meta:
         db_table = "toolsgit"
 
 class LinuxGit(models.Model):
+    id = models.AutoField(primary_key=True)
     git_describe = models.TextField()
     git_commit = models.TextField()
     class Meta:
         db_table = "linuxgit"
 
 class Configurations(models.Model):
+    id = models.AutoField(primary_key=True)
     hash = models.CharField(max_length=32)
     generator = models.TextField()
     config = models.TextField()
     gtime = models.DateTimeField()
-    linuxgit = models.ForeignKey('linuxgit', db_column='linuxgit')
-    toolgit = models.ForeignKey('toolsgit', db_column='toolgit')
+    linuxgit = models.ForeignKey(LinuxGit, db_column='linuxgit')
+    toolgit = models.ForeignKey(ToolsGit, db_column='toolgit')
     class Meta:
         db_table = "configurations"
 
 class Measure(models.Model):
-    conf = models.ForeignKey('configurations')
+    id = models.AutoField(primary_key=True)
+    conf = models.ForeignKey(Configurations, db_column = 'conf')
     measurement = models.TextField()
     output = models.TextField()
     result = models.TextField()
     value = models.FloatField()
     mtime = models.DateTimeField()
-    linuxgit = models.ForeignKey('linuxgit', db_column='linuxgit')
-    toolgit = models.ForeignKey('toolsgit', db_column='toolgit')
+    linuxgit = models.ForeignKey(LinuxGit, db_column='linuxgit')
+    toolgit = models.ForeignKey(ToolsGit, db_column='toolgit')
     class Meta:
         db_table = "measure"
 
 class Configopt(models.Model):
+    id = models.AutoField(primary_key=True)
     configopt = models.TextField()
     class Meta:
         db_table = "configopt"
-- 
2.39.2