From aa63641321b42431e5284e2ef4c392f66d5439ed Mon Sep 17 00:00:00 2001 From: Jogi Hofmüller Date: Tue, 2 Aug 2011 12:07:18 +0000 Subject: - started working on user locations git-svn-id: https://svn.spreadspace.org/mur.sat@92 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- tools/mmd/MmdDb.py | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'tools/mmd/MmdDb.py') diff --git a/tools/mmd/MmdDb.py b/tools/mmd/MmdDb.py index d561f3f..2ef5824 100644 --- a/tools/mmd/MmdDb.py +++ b/tools/mmd/MmdDb.py @@ -12,14 +12,20 @@ class Db: self.conn.text_factory = str self.conn.row_factory = sqlite3.Row self.cursor = self.conn.cursor () + self.cursor.execute ('PRAGMA foreign_keys = ON') + self.conn.commit () def sessionFind (self, session_id): self.cursor.execute ('SELECT * FROM session WHERE id=?', (session_id,)) return self.cursor.fetchone () def sessionInit (self, session_id, email, expires, status): - self.cursor.execute ('INSERT INTO session (id, email, expires, status) VALUES (?,?,?,?)', (session_id, email, expires, status,)) - self.conn.commit () + try: + self.cursor.execute ('INSERT INTO session (id, email, expires, status) VALUES (?,?,?,?)', (session_id, email, expires, status,)) + self.conn.commit () + return True + except sqlite3.IntegrityError: + return False def sessionDelete (self, session_id): self.cursor.execute ('DELETE FROM session WHERE id=?', (session_id,)) @@ -46,9 +52,13 @@ class Db: # user related methods # def userCreate (self, user_id, firstname, lastname, email, callsign, password, code, regtimeout): - self.cursor.execute ('INSERT INTO user (id, firstname, lastname, email, callsign, password, code, regtimeout) VALUES (?,?,?,?,?,?,?,?)', + try: + self.cursor.execute ('INSERT INTO user (id, firstname, lastname, email, callsign, password, code, regtimeout) VALUES (?,?,?,?,?,?,?,?)', (user_id, firstname, lastname, email, callsign, password, code, regtimeout)) - self.conn.commit () + self.conn.commit () + return True + except sqlite3.IntegrityError: + return False def userConfirm (self, code): self.cursor.execute ('UPDATE user SET status="valid" WHERE code=?', (code, )) @@ -74,6 +84,19 @@ class Db: self.cursor.execute ('SELECT * FROM user WHERE code=? and status="pending"', (code,)) return self.cursor.fetchone () + # location related methods + def locationCreate (self, location_id, name, longitude, latitude, user_id, is_default): + try: + self.cursor.execute ('INSERT INTO location (id, name, longitude, latitude, user_id, is_default) VALUES (?,?,?,?,?,?)', (location_id, name, longitude, latitude, user_id, is_default)) + self.conn.commit () + return True + except sqlite3.IntegrityError: + return False + + def locationFindUserId (self, user_id): + self.cursor.execute ('SELECT * FROM location WHERE user_id=?', (user_id,)) + return self.cursor.fetchone () + def close (self): self.cursor.close () self.conn.close () -- cgit v1.2.3