forked from rDrama/rDrama
fix claim_rewards by not importing Transaction from sqlalchemy which overrides my Transaction class
parent
abd91f81ac
commit
13c99ec9ad
|
@ -1270,7 +1270,7 @@ class OrgyTypes:
|
||||||
RUMBLE = 2
|
RUMBLE = 2
|
||||||
TWITCH = 3
|
TWITCH = 3
|
||||||
|
|
||||||
from sqlalchemy import *
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.orm import scoped_session, sessionmaker
|
from sqlalchemy.orm import scoped_session, sessionmaker
|
||||||
|
|
||||||
engine = create_engine(environ.get("DATABASE_URL").strip())
|
engine = create_engine(environ.get("DATABASE_URL").strip())
|
||||||
|
|
|
@ -2,7 +2,6 @@ import time
|
||||||
from random import choice
|
from random import choice
|
||||||
|
|
||||||
from flask import g
|
from flask import g
|
||||||
from sqlalchemy import *
|
|
||||||
from files.classes.lottery import Lottery
|
from files.classes.lottery import Lottery
|
||||||
|
|
||||||
from files.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
|
|
|
@ -2,7 +2,6 @@ from flask import g
|
||||||
import time
|
import time
|
||||||
import calendar
|
import calendar
|
||||||
import matplotlib.pyplot as plt
|
import matplotlib.pyplot as plt
|
||||||
from sqlalchemy import *
|
|
||||||
|
|
||||||
from files.classes.user import User
|
from files.classes.user import User
|
||||||
from files.classes.post import Post
|
from files.classes.post import Post
|
||||||
|
|
|
@ -2,7 +2,6 @@ import re
|
||||||
import time
|
import time
|
||||||
from calendar import timegm
|
from calendar import timegm
|
||||||
|
|
||||||
from sqlalchemy import *
|
|
||||||
from sqlalchemy.orm import load_only
|
from sqlalchemy.orm import load_only
|
||||||
|
|
||||||
from files.helpers.regex import *
|
from files.helpers.regex import *
|
||||||
|
|
Loading…
Reference in New Issue