From ea2b418c6aa910d5d421cc351d173da05a3a55f4 Mon Sep 17 00:00:00 2001 From: spla Date: Fri, 22 May 2020 09:11:31 +0200 Subject: [PATCH] Fix #2 issue --- db-setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/db-setup.py b/db-setup.py index 08a1a18..81caf35 100644 --- a/db-setup.py +++ b/db-setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import pdb import getpass import os import sys @@ -70,14 +69,14 @@ def create_table(db, db_user, table, sql): conn.close() ############################################################################################# - + # Load configuration from config file config_filepath = "config.txt" mastodon_db = get_parameter("mastodon_db", config_filepath) # E.g., mastodon_production mastodon_db_user = get_parameter("mastodon_db_user", config_filepath) # E.g., mastodon mailing_db = get_parameter("mailing_db", config_filepath) # E.g., inactive mailing_db_user = get_parameter("mailing_db_user", config_filepath) # E.g., mastodon -mailing_db_table = get_parameter("mailing_db_table", config_filepath) # E.g., inactive_users +mailing_db_table = get_parameter("mailing_db_table", config_filepath) # E.g., inactive_users ############################################################ # create database @@ -131,7 +130,7 @@ if conn is not None: print("\n") ############################################################ -# Create needed tables +# Create needed tables ############################################################ print("Creating table...") @@ -141,8 +140,9 @@ print("Creating table...") db = mailing_db db_user = mailing_db_user table = mailing_db_table -sql = """create table "+table+" (datetime timestamptz, account_id int primary key, username varchar(30), email varchar(50), emailed_at timestamptz, emailed boolean default False, deleted boolean default False, - elapse_days varchar(30), to_be_deleted boolean default False, recipient_error boolean default False, feedback boolean default False)""" +sql = "create table " + table + "(datetime timestamptz, account_id int primary key, username varchar(30), email varchar(50), emailed_at timestamptz," +sql += "emailed boolean default False, deleted boolean default False, elapse_days varchar(30), to_be_deleted boolean default False," +sql += "recipient_error boolean default False, feedback boolean default False)" create_table(db, db_user, table, sql) #####################################