freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

db/*: Add quotes for all tables and fields 

This is a cosmetic change only meant to harmonize style.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-11-22 22:07:18 +01:00
parent c6fdf34a0a
commit 95a67bf0a4
5 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmap/db/gws.py
View File

@ -9,7 +9,7 @@ from ffmap.mysqltools import FreifunkMySQL
mysql = FreifunkMySQL() mysql = FreifunkMySQL()
mysql.execute(""" mysql.execute("""
CREATE TABLE gw ( CREATE TABLE `gw` (
`id` smallint(5) UNSIGNED NOT NULL, `id` smallint(5) UNSIGNED NOT NULL,
`name` varchar(50) COLLATE utf8_unicode_ci NOT NULL, `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
`stats_page` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL, `stats_page` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
@ -18,18 +18,18 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE gw ALTER TABLE `gw`
ADD PRIMARY KEY (`id`), ADD PRIMARY KEY (`id`),
ADD UNIQUE KEY `name` (`name`) ADD UNIQUE KEY `name` (`name`)
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE gw ALTER TABLE `gw`
MODIFY `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT MODIFY `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE gw_admin ( CREATE TABLE `gw_admin` (
`gw` smallint(5) UNSIGNED NOT NULL, `gw` smallint(5) UNSIGNED NOT NULL,
`name` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`prio` tinyint(3) UNSIGNED NOT NULL `prio` tinyint(3) UNSIGNED NOT NULL
@ -37,12 +37,12 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE gw_admin ALTER TABLE `gw_admin`
ADD PRIMARY KEY (`gw`,`name`) ADD PRIMARY KEY (`gw`,`name`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE gw_netif ( CREATE TABLE `gw_netif` (
`gw` smallint(5) UNSIGNED NOT NULL, `gw` smallint(5) UNSIGNED NOT NULL,
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
`netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL, `netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
@ -56,7 +56,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE gw_netif ALTER TABLE `gw_netif`
ADD PRIMARY KEY (`mac`), ADD PRIMARY KEY (`mac`),
ADD KEY `gw` (`gw`) ADD KEY `gw` (`gw`)
""") """)

24
ffmap/db/hoods.py
View File

@ -9,21 +9,21 @@ from ffmap.mysqltools import FreifunkMySQL
mysql = FreifunkMySQL() mysql = FreifunkMySQL()
mysql.execute(""" mysql.execute("""
CREATE TABLE hoods ( CREATE TABLE `hoods` (
id smallint(6) UNSIGNED NOT NULL, `id` smallint(6) UNSIGNED NOT NULL,
name varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE hoods ALTER TABLE `hoods`
ADD PRIMARY KEY (id), ADD PRIMARY KEY (`id`),
ADD UNIQUE KEY name (name) ADD UNIQUE KEY `name` (`name`)
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE hoods ALTER TABLE `hoods`
MODIFY id smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT MODIFY `id` smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT
""") """)
mysql.execute(""" mysql.execute("""
@ -36,7 +36,7 @@ mysql.execute("""
""",(10000,NoCoordinates,)) """,(10000,NoCoordinates,))
mysql.execute(""" mysql.execute("""
CREATE TABLE hoodsv1 ( CREATE TABLE `hoodsv1` (
`id` int(11) NOT NULL, `id` int(11) NOT NULL,
`name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`net` varchar(30) COLLATE utf8_unicode_ci NOT NULL, `net` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
@ -48,7 +48,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE hoodsv1 ALTER TABLE `hoodsv1`
ADD PRIMARY KEY (`id`), ADD PRIMARY KEY (`id`),
ADD UNIQUE KEY `name` (`name`), ADD UNIQUE KEY `name` (`name`),
ADD KEY `lat` (`lat`), ADD KEY `lat` (`lat`),
@ -58,7 +58,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE hoodsv2 ( CREATE TABLE `hoodsv2` (
`id` int(11) NOT NULL, `id` int(11) NOT NULL,
`name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`net` varchar(30) COLLATE utf8_unicode_ci NOT NULL, `net` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
@ -68,7 +68,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE hoodsv2 ALTER TABLE `hoodsv2`
ADD PRIMARY KEY (`id`), ADD PRIMARY KEY (`id`),
ADD UNIQUE KEY `name` (`name`), ADD UNIQUE KEY `name` (`name`),
ADD KEY `lat` (`lat`), ADD KEY `lat` (`lat`),

54
ffmap/db/routers.py
View File

@ -9,7 +9,7 @@ from ffmap.mysqltools import FreifunkMySQL
mysql = FreifunkMySQL() mysql = FreifunkMySQL()
mysql.execute(""" mysql.execute("""
CREATE TABLE banned ( CREATE TABLE `banned` (
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
`added` datetime NOT NULL `added` datetime NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
@ -21,37 +21,37 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE blocked ( CREATE TABLE `blocked` (
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
`added` datetime NOT NULL `added` datetime NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE blocked ALTER TABLE `blocked`
ADD PRIMARY KEY (`mac`) ADD PRIMARY KEY (`mac`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE netifs ( CREATE TABLE `netifs` (
`id` smallint(6) UNSIGNED NOT NULL, `id` smallint(6) UNSIGNED NOT NULL,
`name` varchar(15) COLLATE utf8_unicode_ci NOT NULL `name` varchar(15) COLLATE utf8_unicode_ci NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE netifs ALTER TABLE `netifs`
ADD PRIMARY KEY (`id`), ADD PRIMARY KEY (`id`),
ADD UNIQUE KEY `name` (`name`) ADD UNIQUE KEY `name` (`name`)
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE netifs ALTER TABLE `netifs`
MODIFY `id` smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT MODIFY `id` smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router ( CREATE TABLE `router` (
`id` mediumint(8) UNSIGNED NOT NULL, `id` mediumint(8) UNSIGNED NOT NULL,
`status` varchar(20) COLLATE utf8_unicode_ci NOT NULL, `status` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
`hostname` varchar(200) COLLATE utf8_unicode_ci NOT NULL, `hostname` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
@ -106,7 +106,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router ALTER TABLE `router`
ADD PRIMARY KEY (`id`), ADD PRIMARY KEY (`id`),
ADD KEY `created` (`created`), ADD KEY `created` (`created`),
ADD KEY `hostname` (`hostname`), ADD KEY `hostname` (`hostname`),
@ -119,12 +119,12 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router ALTER TABLE `router`
MODIFY `id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT MODIFY `id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_events ( CREATE TABLE `router_events` (
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`time` datetime NOT NULL, `time` datetime NOT NULL,
`type` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `type` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
@ -133,12 +133,12 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_events ALTER TABLE `router_events`
ADD PRIMARY KEY (`router`,`time`,`type`) ADD PRIMARY KEY (`router`,`time`,`type`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_gw ( CREATE TABLE `router_gw` (
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
`quality` float NOT NULL, `quality` float NOT NULL,
@ -150,12 +150,12 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_gw ALTER TABLE `router_gw`
ADD PRIMARY KEY (`router`,`mac`) ADD PRIMARY KEY (`router`,`mac`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_ipv6 ( CREATE TABLE `router_ipv6` (
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL, `netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
`ipv6` binary(16) NOT NULL `ipv6` binary(16) NOT NULL
@ -163,12 +163,12 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_ipv6 ALTER TABLE `router_ipv6`
ADD PRIMARY KEY (`router`,`netif`,`ipv6`) ADD PRIMARY KEY (`router`,`netif`,`ipv6`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_neighbor ( CREATE TABLE `router_neighbor` (
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
`netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL, `netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
@ -178,12 +178,12 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_neighbor ALTER TABLE `router_neighbor`
ADD PRIMARY KEY (`router`,`mac`) ADD PRIMARY KEY (`router`,`mac`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_netif ( CREATE TABLE `router_netif` (
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL, `netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
`mtu` smallint(6) NOT NULL, `mtu` smallint(6) NOT NULL,
@ -203,13 +203,13 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_netif ALTER TABLE `router_netif`
ADD PRIMARY KEY (`router`,`netif`), ADD PRIMARY KEY (`router`,`netif`),
ADD KEY `mac` (`mac`) ADD KEY `mac` (`mac`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_stats ( CREATE TABLE `router_stats` (
`time` int(11) NOT NULL, `time` int(11) NOT NULL,
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`sys_proctot` smallint(6) NOT NULL, `sys_proctot` smallint(6) NOT NULL,
@ -228,13 +228,13 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_stats ALTER TABLE `router_stats`
ADD PRIMARY KEY (`time`,`router`), ADD PRIMARY KEY (`time`,`router`),
ADD KEY `router` (`router`) ADD KEY `router` (`router`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_stats_gw ( CREATE TABLE `router_stats_gw` (
`time` int(11) NOT NULL, `time` int(11) NOT NULL,
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
@ -243,13 +243,13 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_stats_gw ALTER TABLE `router_stats_gw`
ADD PRIMARY KEY (`time`,`router`,`mac`), ADD PRIMARY KEY (`time`,`router`,`mac`),
ADD KEY `router` (`router`) ADD KEY `router` (`router`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_stats_neighbor ( CREATE TABLE `router_stats_neighbor` (
`time` int(11) NOT NULL, `time` int(11) NOT NULL,
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
@ -258,13 +258,13 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_stats_neighbor ALTER TABLE `router_stats_neighbor`
ADD PRIMARY KEY (`time`,`router`,`mac`), ADD PRIMARY KEY (`time`,`router`,`mac`),
ADD KEY `router` (`router`) ADD KEY `router` (`router`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE router_stats_netif ( CREATE TABLE `router_stats_netif` (
`time` int(11) NOT NULL, `time` int(11) NOT NULL,
`router` mediumint(8) UNSIGNED NOT NULL, `router` mediumint(8) UNSIGNED NOT NULL,
`netif` smallint(6) UNSIGNED NOT NULL, `netif` smallint(6) UNSIGNED NOT NULL,
@ -275,7 +275,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE router_stats_netif ALTER TABLE `router_stats_netif`
ADD PRIMARY KEY (`time`,`router`,`netif`), ADD PRIMARY KEY (`time`,`router`,`netif`),
ADD KEY `router` (`router`), ADD KEY `router` (`router`),
ADD KEY `deletebit` (`deletebit`) ADD KEY `deletebit` (`deletebit`)

8
ffmap/db/stats.py
View File

@ -27,7 +27,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE stats_gw ( CREATE TABLE `stats_gw` (
`time` int(11) NOT NULL, `time` int(11) NOT NULL,
`mac` bigint(20) UNSIGNED NOT NULL, `mac` bigint(20) UNSIGNED NOT NULL,
`clients` mediumint(9) NOT NULL, `clients` mediumint(9) NOT NULL,
@ -39,13 +39,13 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE stats_gw ALTER TABLE `stats_gw`
ADD PRIMARY KEY (`time`,`mac`), ADD PRIMARY KEY (`time`,`mac`),
ADD KEY `mac` (`mac`) ADD KEY `mac` (`mac`)
""") """)
mysql.execute(""" mysql.execute("""
CREATE TABLE stats_hood ( CREATE TABLE `stats_hood` (
`time` int(11) NOT NULL, `time` int(11) NOT NULL,
`hood` smallint(5) UNSIGNED NOT NULL, `hood` smallint(5) UNSIGNED NOT NULL,
`clients` mediumint(9) NOT NULL, `clients` mediumint(9) NOT NULL,
@ -59,7 +59,7 @@ mysql.execute("""
""") """)
mysql.execute(""" mysql.execute("""
ALTER TABLE stats_hood ALTER TABLE `stats_hood`
ADD PRIMARY KEY (`time`,`hood`), ADD PRIMARY KEY (`time`,`hood`),
ADD KEY `hood` (`hood`) ADD KEY `hood` (`hood`)
""") """)

3
ffmap/db/users.py
View File

@ -18,8 +18,7 @@ mysql.execute("""
`created` datetime NOT NULL, `created` datetime NOT NULL,
`admin` tinyint(1) NOT NULL DEFAULT '0', `admin` tinyint(1) NOT NULL DEFAULT '0',
`abuse` tinyint(1) NOT NULL DEFAULT '0' `abuse` tinyint(1) NOT NULL DEFAULT '0'
) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
""") """)
mysql.execute(""" mysql.execute("""