diff --git a/abonapp/test.sql b/abonapp/test.sql deleted file mode 100644 index b167ead..0000000 --- a/abonapp/test.sql +++ /dev/null @@ -1,21 +0,0 @@ -SELECT - `base_accounts`.`username`, - `base_accounts`.`telephone`, - `abonent`.`ballance`, - `abonent_tariff`.`tariff_id`, - `tariffs`.`title`, - `tariffs`.`speedIn`, - `tariffs`.`speedOut`, - `tariffs`.`amount`, - `groups`.`title`, - `abon_street`.`name` -FROM `abonent` - INNER JOIN `base_accounts` ON (`abonent`.`baseaccount_ptr_id` = `base_accounts`.`id`) - INNER JOIN `groups` ON (`abonent`.`group_id` = `groups`.`id`) - LEFT OUTER JOIN `abonent_tariff` ON (`abonent`.`current_tariff_id` = `abonent_tariff`.`id`) - LEFT OUTER JOIN `tariffs` ON (`abonent_tariff`.`tariff_id` = `tariffs`.`id`) - LEFT OUTER JOIN `abon_street` ON (`abonent`.`street_id` = `abon_street`.`id`) - LEFT OUTER JOIN `flowcache` ON (`abonent`.`baseaccount_ptr_id` = `flowcache`.`abon_id`) -WHERE (`base_accounts`.`is_admin` = 0 AND `abonent`.`group_id` = 46) -ORDER BY `base_accounts`.`fio` ASC -LIMIT 20; \ No newline at end of file diff --git a/agent/netflow/mysql_install.sql b/agent/netflow/mysql_install.sql index 8744cb5..0d1f0f3 100644 --- a/agent/netflow/mysql_install.sql +++ b/agent/netflow/mysql_install.sql @@ -1,3 +1,5 @@ +DROP TABLE `flowcache`; + CREATE TABLE `flowcache` ( `last_time` INT(10) UNSIGNED NOT NULL, `abon_id` INT(11) DEFAULT NULL UNIQUE, diff --git a/statistics/migrations/0003_auto_20180814_1921.py b/statistics/migrations/0003_auto_20180814_1921.py index 0730c82..4486464 100644 --- a/statistics/migrations/0003_auto_20180814_1921.py +++ b/statistics/migrations/0003_auto_20180814_1921.py @@ -2,8 +2,7 @@ # Generated by Django 1.11 on 2018-08-14 19:21 from __future__ import unicode_literals -from django.db import migrations, models -from statistics.fields import UnixDateTimeField +from django.db import migrations class Migration(migrations.Migration): @@ -14,17 +13,14 @@ class Migration(migrations.Migration): ] operations = [ - migrations.DeleteModel('StatCache'), - migrations.CreateModel( - name='StatCache', - fields=[ - ('last_time', UnixDateTimeField()), - ('abon', models.OneToOneField(on_delete=models.deletion.CASCADE, primary_key=True, serialize=False, to='abonapp.Abon')), - ('octets', models.PositiveIntegerField(default=0)), - ('packets', models.PositiveIntegerField(default=0)), - ], - options={ - 'db_table': 'flowcache', - }, + migrations.RunSQL( + "DROP TABLE `flowcache`; " + "CREATE TABLE `flowcache` ( " + " `last_time` INT(10) UNSIGNED NOT NULL, " + " `abon_id` INT(11) DEFAULT NULL UNIQUE, " + " `octets` INT(10) UNSIGNED NOT NULL, " + " `packets` INT(10) UNSIGNED NOT NULL, " + " KEY `flowcache_abon_id_91e1085d` (`abon_id`) " + ") ENGINE = MEMORY DEFAULT CHARSET = utf8;" ) ]