From f454689117d3a7f3bacec136e53eff6e81716bf0 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 6 Jan 2017 00:03:50 +0100 Subject: Merging DB parameters from two tables --- ausbutler/model.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ausbutler/model.py') diff --git a/ausbutler/model.py b/ausbutler/model.py index fc088fa..d3e4c27 100644 --- a/ausbutler/model.py +++ b/ausbutler/model.py @@ -1,5 +1,5 @@ from cached_property import cached_property -from sqlalchemy import Column, MetaData, Table, func +from sqlalchemy import Column, MetaData, Table, func, join, literal from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.types import Float, Integer, String @@ -82,3 +82,11 @@ class Admin(Base): __table__ = Table('admin', MetaData(bind=session.bind), Column('shortname', String, primary_key=True), autoload=True) + +class Params(Base): + __table__ = Table('params', MetaData(bind=session.bind), + Column('datasource', Integer, primary_key=True), + autoload=True) + +class Parameters(Base): + __table__ = join(Admin, Params, literal(True)) -- cgit v1.2.3