mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

we only need start end... we already have start/end

Browse Source
This commit is contained in:
Tony Murray
2020-04-10 12:32:54 -05:00
parent 6347687d54
commit eac7838de9
2 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
database/migrations/2020_04_08_172357_alert_schedule_utc.php
View File

@@ -12,22 +12,14 @@ class AlertScheduleUtc extends Migration
*/ */
public function up() public function up()
{ {
Schema::table('alert_schedule', function (Blueprint $table) { DB::table('alert_schedule')->where('recurring', 1)->update([
$table->dateTime('start')->nullable()->default('1970-01-02 00:00:01')->change(); 'start' => DB::raw("CONVERT_TZ(IF(`recurring` = 1, STR_TO_DATE(CONCAT(start_recurring_dt, ' ', start_recurring_hr), '%Y-%m-%d %H:%i:%s'), start), @@global.time_zone, '+00:00')"),
$table->dateTime('end')->nullable()->default('1970-01-02 00:00:01')->change(); 'end' => DB::raw("CONVERT_TZ(IF(`recurring` = 1, STR_TO_DATE(CONCAT(end_recurring_dt, ' ', end_recurring_hr), '%Y-%m-%d %H:%i:%s'), end), @@global.time_zone, '+00:00')"),
$table->date('start_recurring_dt')->nullable()->change();
$table->time('start_recurring_hr')->nullable()->change();
$table->time('end_recurring_hr')->nullable()->change();
});
DB::table('alert_schedule')->update([
'start' => DB::raw("CONVERT_TZ(start, @@global.time_zone, '+00:00')"),
'end' => DB::raw("CONVERT_TZ(end, @@global.time_zone, '+00:00')"),
'start_recurring_dt' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(start_recurring_dt, ' '), start_recurring_hr), '%Y-%m-%d %H:%i:%s'), @@global.time_zone, '+00:00'), ' ', 1)"),
'start_recurring_hr' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(start_recurring_dt, ' '), start_recurring_hr), '%Y-%m-%d %H:%i:%s'), @@global.time_zone, '+00:00'), ' ', -1)"),
'end_recurring_dt' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(end_recurring_dt, ' '), end_recurring_hr), '%Y-%m-%d %H:%i:%s'), @@global.time_zone, '+00:00'), ' ', 1)"),
'end_recurring_hr' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(end_recurring_dt, ' '), end_recurring_hr), '%Y-%m-%d %H:%i:%s'), @@global.time_zone, '+00:00'), ' ', -1)"),
]); ]);
Schema::table('alert_schedule', function (Blueprint $table) {
$table->dropColumn(['start_recurring_dt', 'start_recurring_hr', 'end_recurring_dt', 'end_recurring_hr']);
});
} }
/** /**
@@ -37,21 +29,20 @@ class AlertScheduleUtc extends Migration
*/ */
public function down() public function down()
{ {
Schema::table('alert_schedule', function (Blueprint $table) {
$table->date('start_recurring_dt')->nullable(false)->default('1970-01-01')->after('end');
$table->time('start_recurring_hr')->nullable(false)->default('00:00:00')->after('start_recurring_dt');
$table->date('end_recurring_dt')->nullable()->after('start_recurring_hr');
$table->time('end_recurring_hr')->nullable(false)->default('00:00:00')->after('end_recurring_dt');
});
DB::table('alert_schedule')->update([ DB::table('alert_schedule')->update([
'start' => DB::raw("CONVERT_TZ(start, '+00:00', @@global.time_zone)"), 'start' => DB::raw("CONVERT_TZ(start, '+00:00', @@global.time_zone)"),
'end' => DB::raw("CONVERT_TZ(end, '+00:00', @@global.time_zone)"), 'end' => DB::raw("CONVERT_TZ(end, '+00:00', @@global.time_zone)"),
'start_recurring_dt' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(start_recurring_dt, ' '), start_recurring_hr), '%Y-%m-%d %H:%i:%s'), '+00:00', @@global.time_zone), ' ', 1)"), 'start_recurring_dt' => DB::raw("DATE(CONVERT_TZ(start, '+00:00', @@global.time_zone))"),
'start_recurring_hr' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(start_recurring_dt, ' '), start_recurring_hr), '%Y-%m-%d %H:%i:%s'), '+00:00', @@global.time_zone), ' ', -1)"), 'start_recurring_hr' => DB::raw("TIME(CONVERT_TZ(start, '+00:00', @@global.time_zone))"),
'end_recurring_dt' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(end_recurring_dt, ' '), end_recurring_hr), '%Y-%m-%d %H:%i:%s'), '+00:00', @@global.time_zone), ' ', 1)"), 'end_recurring_dt' => DB::raw("DATE(CONVERT_TZ(end, '+00:00', @@global.time_zone))"),
'end_recurring_hr' => DB::raw("SUBSTRING_INDEX(CONVERT_TZ(STR_TO_DATE(CONCAT(CONCAT(end_recurring_dt, ' '), end_recurring_hr), '%Y-%m-%d %H:%i:%s'), '+00:00', @@global.time_zone), ' ', -1)"), 'end_recurring_hr' => DB::raw("TIME(CONVERT_TZ(end, '+00:00', @@global.time_zone))"),
]); ]);
Schema::table('alert_schedule', function (Blueprint $table) {
$table->dateTime('start')->nullable(false)->default('1970-01-02 00:00:01')->change();
$table->dateTime('end')->nullable(false)->default('1970-01-02 00:00:01')->change();
$table->date('start_recurring_dt')->nullable(false)->default('1970-01-01')->change();
$table->time('start_recurring_hr')->nullable(false)->default('00:00:00')->change();
$table->time('end_recurring_hr')->nullable(false)->default('00:00:00')->change();
});
} }
} }

8
misc/db_schema.yaml
View File

@@ -101,12 +101,8 @@ alert_schedule:
Columns: Columns:
- { Field: schedule_id, Type: 'int(10) unsigned', 'Null': false, Extra: auto_increment } - { Field: schedule_id, Type: 'int(10) unsigned', 'Null': false, Extra: auto_increment }
- { Field: recurring, Type: 'tinyint(1) unsigned', 'Null': false, Extra: '', Default: '0' } - { Field: recurring, Type: 'tinyint(1) unsigned', 'Null': false, Extra: '', Default: '0' }
- { Field: start, Type: datetime, 'Null': true, Extra: '', Default: '1970-01-02 00:00:01' } - { Field: start, Type: datetime, 'Null': false, Extra: '', Default: '1970-01-02 00:00:01' }
- { Field: end, Type: datetime, 'Null': true, Extra: '', Default: '1970-01-02 00:00:01' } - { Field: end, Type: datetime, 'Null': false, Extra: '', Default: '1970-01-02 00:00:01' }
- { Field: start_recurring_dt, Type: date, 'Null': true, Extra: '', Default: '1970-01-01' }
- { Field: end_recurring_dt, Type: date, 'Null': true, Extra: '' }
- { Field: start_recurring_hr, Type: time, 'Null': true, Extra: '', Default: '00:00:00' }
- { Field: end_recurring_hr, Type: time, 'Null': true, Extra: '', Default: '00:00:00' }
- { Field: recurring_day, Type: varchar(15), 'Null': true, Extra: '' } - { Field: recurring_day, Type: varchar(15), 'Null': true, Extra: '' }
- { Field: title, Type: varchar(255), 'Null': false, Extra: '' } - { Field: title, Type: varchar(255), 'Null': false, Extra: '' }
- { Field: notes, Type: text, 'Null': false, Extra: '' } - { Field: notes, Type: text, 'Null': false, Extra: '' }