From 60a7648ce421a61e5cbefa186c8c29f2c4ae7dae Mon Sep 17 00:00:00 2001 From: mitsuha_s Date: Thu, 19 May 2022 22:46:55 +0000 Subject: [PATCH] correct init database object --- .gitignore | 2 +- database_interaction.py | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index dbd23b8..8b2d7e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ /.venv # Database -users_subscribes.db \ No newline at end of file +/bot.db \ No newline at end of file diff --git a/database_interaction.py b/database_interaction.py index 56447d3..48aadc9 100644 --- a/database_interaction.py +++ b/database_interaction.py @@ -1,20 +1,12 @@ import sqlite3 class Database(): - __instance = None - - def __new__(cls, *args, **kwargs): - if cls.__instance is None: - cls.__instance = super().__new__(cls) - - return cls.__instance - - def __init__(self): - self.conn = sqlite3.connect('users_subscribes.db') + def __init__(self, path): + self.conn = sqlite3.connect(path) self.cur = self.conn.cursor() - self.cur.execute('CREATE TABLE users (id INTEGER, telegram_id NUMERIC, PRIMARY KEY(id))') - self.cur.execute('CREATE TABLE feeds (id INTEGER, link TEXT, PRIMARY KEY(id))') - self.cur.execute('CREATE TABLE subscribes (user_id INTEGER, feed_id INTEGER, FOREIGN KEY(user_id) REFERENCES users(id), FOREIGN KEY(feed_id) REFERENCES feeds(id))') - self.cur.execute('CREATE TABLE feeds_last_items (feed_id INTEGER, link TEXT, title TEXT, description TEXT, date NUMERIC, FOREIGN KEY(feed_id) REFERENCES feeds(id))') + self.cur.execute('CREATE TABLE IF NOT EXISTS users (id INTEGER, telegram_id NUMERIC, PRIMARY KEY(id))') + self.cur.execute('CREATE TABLE IF NOT EXISTS feeds (id INTEGER, link TEXT, PRIMARY KEY(id))') + self.cur.execute('CREATE TABLE IF NOT EXISTS subscribes (user_id INTEGER, feed_id INTEGER, FOREIGN KEY(user_id) REFERENCES users(id), FOREIGN KEY(feed_id) REFERENCES feeds(id))') + self.cur.execute('CREATE TABLE IF NOT EXISTS feeds_last_items (feed_id INTEGER, link TEXT, title TEXT, description TEXT, date NUMERIC, FOREIGN KEY(feed_id) REFERENCES feeds(id))') def add_rss_feed(): pass