Mercurial > party-buddy-server
changeset 9:596b325e41a7
Some changes I am too tired to remember
| author | Michal Kawalec <mkawalec@lavabit.com> |
|---|---|
| date | Sun, 02 Jun 2013 06:34:12 +0200 |
| parents | 7054f6ae84d5 |
| children | f3db2ed80648 |
| files | server/database.py server/helpers.py server/models.py |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/server/database.py Sat Jun 01 23:14:50 2013 +0200 +++ b/server/database.py Sun Jun 02 06:34:12 2013 +0200 @@ -20,7 +20,7 @@ # import all modules here that might define models so that # they will be registered properly on the metadata. Otherwise # you will have to import them first before calling init_db() - import infocredit.models + import server.models Base.metadata.create_all(engine)
--- a/server/helpers.py Sat Jun 01 23:14:50 2013 +0200 +++ b/server/helpers.py Sun Jun 02 06:34:12 2013 +0200 @@ -1,4 +1,4 @@ -from rand import randint +from random import randint chars = 'abcdefghijklmnoprstuwqxyzABCDEFGHIJKLMNOPRSTUWXYZ0123456789'
--- a/server/models.py Sat Jun 01 23:14:50 2013 +0200 +++ b/server/models.py Sun Jun 02 06:34:12 2013 +0200 @@ -31,8 +31,8 @@ self.edition_timestamp = datetime.now() checkin_user = Table('checkin_user', Base.metadata, - Column('checkin_id', Integer, ForeignKey('checkin.id'), primary_key=True), - Column('user_id', Integer, ForeignKey('user.id'), primary_key=True), + Column('checkin_id', Integer, ForeignKey('checkins.id'), primary_key=True), + Column('user_id', Integer, ForeignKey('users.id'), primary_key=True), ) class User(Boilerplate, Base): @@ -90,7 +90,7 @@ class PhoneNumber(Boilerplate, Base): - __tablename__ = 'user_number' + __tablename__ = 'user_numbers' number = Column(String(20), primary_key=True) owner_id = Column(Integer, ForeignKey('users.id')) @@ -99,7 +99,7 @@ class Mac(Boilerplate, Base): - __tablename__ = 'mac' + __tablename__ = 'macs' mac = Column(String(16), primary_key=True) owner = ForeignKey(User) @@ -109,7 +109,7 @@ class PanicContact(Boilerplate, Base): - __tablename__ = 'panic_contact' + __tablename__ = 'panic_contacts' id = Column(Integer, Sequence('panic_contact_id_seq'), primary_key=True) name = Column(String()) number = Column(String(20)) @@ -122,7 +122,7 @@ class Checkin(Boilerplate, Base): - __tablename__ = 'checkin' + __tablename__ = 'checkins' id = Column(Integer, Sequence('checkin_id_seq'), primary_key=True) time = Column(DateTime()) lat = Column(Float)