move db to separate dir

server/brmbar-server

@@ -107,12 +107,9 @@ def download_file(filename):
         filename = 'missing.jpg'
     return send_from_directory('static/items/', filename, mimetype='image/jpeg')
 
-def connect_db():
-    return sqlite3.connect('brmbar.db')
-
 @app.before_request
 def before_request():
-    g.db = connect_db()
+    g.db = sqlite3.connect('db/brmbar.db')
 
 @app.after_request
 def after_request(response):

server/db/items.sql

@@ -1,17 +1,17 @@
-INSERT INTO items(code, name, price) VALUES("4029764001807", "Club Mate 0.5L", 35);
+INSERT INTO items(code, name, price) VALUES("4029764001807", "Club Mate 0.5l", 35);
-INSERT INTO items(code, name, price) VALUES("4029764001821", "Club Mate 0.33L", 25);
+INSERT INTO items(code, name, price) VALUES("4029764001821", "Club Mate 0.33l", 25);
-INSERT INTO items(code, name, price) VALUES("5018374350930", "Tesco Baked Beans in Tomato Sauce", 20);
+INSERT INTO items(code, name, price) VALUES("5018374350930", "Fazole v tomate", 20);
 INSERT INTO items(code, name, price) VALUES("7622300331436", "Siesta mlecna", 10);
 INSERT INTO items(code, name, price) VALUES("7622300331467", "Siesta horka", 10);
 INSERT INTO items(code, name, price) VALUES("7622300331498", "Siesta oriskova", 10);
 INSERT INTO items(code, name, price) VALUES("7613031880065", "Delissa oriskova", 7);
 INSERT INTO items(code, name, price) VALUES("7613031880003", "Delissa vanilkova", 7);
 INSERT INTO items(code, name, price) VALUES("7613031879946", "Delissa cokoladova", 7);
-INSERT INTO items(code, name, price) VALUES("8593868000555", "Pivo Branik 10% svetle", 25);
+INSERT INTO items(code, name, price) VALUES("8593868000555", "Branik 10%", 25);
-INSERT INTO items(code, name, price) VALUES("8594404000329", "Pivo Gambrinus 10% svetle", 25);
+INSERT INTO items(code, name, price) VALUES("8594404000329", "Gambrinus 10%", 25);
-INSERT INTO items(code, name, price) VALUES("8594404001241", "Pivo Radegast 10% svetle", 25);
+INSERT INTO items(code, name, price) VALUES("8594404001241", "Radegast 10%", 25);
-INSERT INTO items(code, name, price) VALUES("8594001021512", "Matonni perliva 1.5L", 20);
+INSERT INTO items(code, name, price) VALUES("8594001021512", "Matonni perliva 1.5l", 20);
-INSERT INTO items(code, name, price) VALUES("5449000000286", "Coca-Cola 2L", 50);
+INSERT INTO items(code, name, price) VALUES("5449000000286", "Coca-Cola 2l", 50);
 INSERT INTO items(code, name, price) VALUES("8801043263108", "Shin Cup Noodle Soup", 25);
 INSERT INTO items(code, name, price) VALUES("8934646229308", "Lucky Beef Flavor", 10);
 INSERT INTO items(code, name, price) VALUES("8594033171902", "Big Shock tycinka", 15);
@@ -19,24 +19,24 @@ INSERT INTO items(code, name, price) VALUES("85909311", "Margot tycinka", 15);
 INSERT INTO items(code, name, price) VALUES("8584004041198", "Tatranky", 8);
 INSERT INTO items(code, name, price) VALUES("85917095", "Margot tycinka +20%", 17);
 INSERT INTO items(code, name, price) VALUES("8593894800075", "Bebe cokoladove", 15);
-INSERT INTO items(code, name, price) VALUES("5906747308803", "Pim's coko piskoty visnove", 30);
+INSERT INTO items(code, name, price) VALUES("5906747308803", "Coko piskoty visen", 30);
 INSERT INTO items(code, name, price) VALUES("8584004010200", "Kavenky", 10);
-INSERT INTO items(code, name, price) VALUES("8586011330463", "Vinea Biela", 50);
+INSERT INTO items(code, name, price) VALUES("8586011330463", "Vinea biela", 50);
-INSERT INTO items(code, name, price) VALUES("8586011330470", "Vinea Cervena", 50);
+INSERT INTO items(code, name, price) VALUES("8586011330470", "Vinea cervena", 50);
 INSERT INTO items(code, name, price) VALUES("8593894911030", "Zlate oplatky liskooriskove", 17);
 INSERT INTO items(code, name, price) VALUES("8593894911122", "Zlate oplatky smetanove", 17);
 INSERT INTO items(code, name, price) VALUES("85951631", "Frisco brusinka", 25);
 INSERT INTO items(code, name, price) VALUES("8593868110445", "Staropramen 10%", 25);
 INSERT INTO items(code, name, price) VALUES("8714800011426", "Bavaria 0.0%", 25);
-INSERT INTO items(code, name, price) VALUES("8594003844782", "Orangina zluta", 25);
+INSERT INTO items(code, name, price) VALUES("8594003844782", "Orangina zluta 0.5l", 25);
-INSERT INTO items(code, name, price) VALUES("3155930006015", "Desperados 0.33L", 40);
+INSERT INTO items(code, name, price) VALUES("3155930006015", "Desperados 0.33l", 40);
-INSERT INTO items(code, name, price) VALUES("5060166692636", "Monster Ripper 0.5L", 35);
+INSERT INTO items(code, name, price) VALUES("5060166692636", "Monster Ripper 0.5l", 35);
 INSERT INTO items(code, name, price) VALUES("8585002408976", "Kure na paprice", 35);
 INSERT INTO items(code, name, price) VALUES("8593837223220", "Kure na paprice", 35);
-INSERT INTO items(code, name, price) VALUES("8593837223213", "Gulas", 35);
+INSERT INTO items(code, name, price) VALUES("8593837223213", "Gulas s testovinami", 35);
 INSERT INTO items(code, name, price) VALUES("8593837223176", "Bolonska omacka", 35);
-INSERT INTO items(code, name, price) VALUES("031146254903", "Big Ramen - Shin Cup Noodle Soup", 35);
+INSERT INTO items(code, name, price) VALUES("031146254903", "Big Ramen Noodle Soup", 35);
-INSERT INTO items(code, name, price) VALUES("031146254019", "Big Ramen - Noodle Shrimp Flavour", 35);
+INSERT INTO items(code, name, price) VALUES("031146254019", "Big Ramen Shrimp Flavor", 35);
 INSERT INTO items(code, name, price) VALUES("85933323", "Deli pistaciova", 10);
 INSERT INTO items(code, name, price) VALUES("85933354", "Deli cokoladova", 10);
-INSERT INTO items(code, name, price) VALUES("8594067540071", "Prave hospodske bramburky", 12);
+INSERT INTO items(code, name, price) VALUES("8594067540071", "Hospodske bramburky", 12);

server/db/reset

@@ -0,0 +1,3 @@
+#!/bin/sh
+sqlite3 brmbar.db < schema.sql
+sqlite3 brmbar.db < items.sql