From 97132ce88aac5c45e70217b7bff38331ae76bd5f Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Thu, 13 Oct 2011 21:27:56 +0200 Subject: Fix some problems related to postgresql and models --- budget/default_settings.py | 7 ++++++- budget/models.py | 4 ++-- budget/run.py | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'budget') diff --git a/budget/default_settings.py b/budget/default_settings.py index ff61010..111abf2 100644 --- a/budget/default_settings.py +++ b/budget/default_settings.py @@ -1,6 +1,11 @@ -DEBUG = True +DEBUG = False SQLALCHEMY_DATABASE_URI = 'sqlite:///budget.db' SQLACHEMY_ECHO = DEBUG SECRET_KEY = "tralala" DEFAULT_MAIL_SENDER = ("Budget manager", "budget@notmyidea.org") + +try: + from settings import * +except ImportError: + pass diff --git a/budget/models.py b/budget/models.py index 9d93d2f..f84194e 100644 --- a/budget/models.py +++ b/budget/models.py @@ -92,7 +92,7 @@ class Person(db.Model): _to_serialize = ("id", "name", "activated") id = db.Column(db.Integer, primary_key=True) - project_id = db.Column(db.Integer, db.ForeignKey("project.id")) + project_id = db.Column(db.String, db.ForeignKey("project.id")) bills = db.relationship("Bill", backref="payer") name = db.Column(db.UnicodeText) @@ -163,7 +163,7 @@ class Bill(db.Model): class Archive(db.Model): id = db.Column(db.Integer, primary_key=True) - project_id = db.Column(db.Integer, db.ForeignKey("project.id")) + project_id = db.Column(db.String, db.ForeignKey("project.id")) name = db.Column(db.UnicodeText) @property diff --git a/budget/run.py b/budget/run.py index e1711a7..39b297e 100644 --- a/budget/run.py +++ b/budget/run.py @@ -1,10 +1,12 @@ from web import main, db, mail from api import api +import os from flask import * app = Flask(__name__) app.config.from_object("default_settings") + app.register_blueprint(main) app.register_blueprint(api) -- cgit v1.1