diff --git a/db1.db b/db1.db index c93148d6872c41fe0b6fe01623f48a468a0009cd..d4105935b1ed230c7314e9a891b1d97a3ea94435 100644 Binary files a/db1.db and b/db1.db differ diff --git a/db2.py b/db2.py index 2a4457618632856e5c6eacc2164050258f316a94..f4f0174f0fc101fff646cec592d0f5c7f4ebeff6 100644 --- a/db2.py +++ b/db2.py @@ -123,11 +123,11 @@ def getAllVognoppsett(): def createTogrute(): cursor.execute( - '''INSERT INTO Togrute VALUES (1, '09:05', '23:05', 'Mandag', 2, 1, 'Trondheim', 'Bodø', 'Hovedretning', 1)''') + '''INSERT INTO Togrute VALUES (1, '09:05', '23:05', 2, 1, 'Trondheim', 'Bodø', 'Hovedretning', 1)''') cursor.execute( - '''INSERT INTO Togrute VALUES (2, '17:34', '07:49', 'Mandag', 1, 1, 'Trondheim', 'Bodø', 'Hovedretning', 1)''') + '''INSERT INTO Togrute VALUES (2, '17:34', '07:49', 1, 1, 'Trondheim', 'Bodø', 'Hovedretning', 1)''') cursor.execute( - '''INSERT INTO Togrute VALUES (3, '14:13', '08:11', 'Mandag', 3, 1, 'Mo i Rana', 'Trondheim', 'Mot hovedretning', 1)''') + '''INSERT INTO Togrute VALUES (3, '14:13', '08:11', 3, 1, 'Mo i Rana', 'Trondheim', 'Mot hovedretning', 1)''') con.commit() @@ -137,8 +137,31 @@ def getAllTogrute(): print("Togrute:") print(rows) -# Spørre om avgangstid og ankomsttid +def createTogruteTabell(): + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Mandag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Tirsdag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Onsdag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Torsdag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Fredag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Lørdag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Søndag', 1)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Mandag', 2)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Tirsdag', 2)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Onsdag', 2)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Torsdag', 2)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Fredag', 2)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Mandag', 3)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Tirsdag', 3)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Onsdag', 3)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Torsdag', 3)''') + cursor.execute('''INSERT INTO TogruteTabell VALUES ('Fredag', 3)''') + con.commit() +def getAllTogruteTabell(): + cursor.execute("SELECT * FROM TogruteTabell") + rows = cursor.fetchall() + print("TogruteTabell:") + print(rows) def createGaarInnom(): cursor.execute( @@ -193,7 +216,6 @@ def createTilhorendeOperator(): cursor.execute('''INSERT INTO TilhorendeOperator VALUES (1, 3)''') con.commit() - def getAllTilhorendeOperator(): cursor.execute("SELECT * FROM TilhorendeOperator") rows = cursor.fetchall() @@ -211,6 +233,7 @@ def createAll(): createOperator() createVognoppsett() createTogrute() + createTogruteTabell() createGaarInnom() createTilhorendeVognoppsett() createTilhorendeOperator() @@ -226,17 +249,38 @@ def getAll(): getAllOperator() getAllVognoppsett() getAllTogrute() + getAllTogruteTabell() getAllGaarInnom() getAllTilhorendeVognoppsett() getAllTilhorendeOperator() +def deleteAll(): + cursor.execute('''DELETE FROM Banestrekning''') + cursor.execute('''DELETE FROM Billett''') + cursor.execute('''DELETE FROM Delstrekning''') + cursor.execute('''DELETE FROM GaarInnom''') + cursor.execute('''DELETE FROM Jernbanestasjon''') + cursor.execute('''DELETE FROM Kunde''') + cursor.execute('''DELETE FROM Kundeordre''') + cursor.execute('''DELETE FROM Operator''') + cursor.execute('''DELETE FROM Seng''') + cursor.execute('''DELETE FROM Sete''') + cursor.execute('''DELETE FROM Sittevogn''') + cursor.execute('''DELETE FROM Sovevogn''') + cursor.execute('''DELETE FROM TilhorendeOperator''') + cursor.execute('''DELETE FROM TilhorendeVognoppsett''') + cursor.execute('''DELETE FROM Togrute''') + cursor.execute('''DELETE FROM TogruteTabell''') + cursor.execute('''DELETE FROM Vognoppsett''') + cursor.execute('''DELETE FROM Vogntype''') + # Denne lager all data: # All data skal ligge inne fra før av, så skal ikke i utgangspunkte bruke denne med mindre man har slettet dataen -## createAll() +createAll() -# Denne skriver ut all data: -## getAll() +# Denne skriver ut all data: +getAll() con.close()