From b4e088afe8bbbcb57129d37fda9eb06554072711 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 17 Mar 2022 22:00:59 +0100 Subject: [PATCH] Update triggers and packages used --- composer.lock | 10 +++--- ...018_01_20_195528_create_releases_table.php | 8 +++++ .../2018_01_20_195934_create_predb_table.php | 10 ++++++ ...1_20_200056_create_release_files_table.php | 9 +++++ ..._20_221744_create_check_insert_trigger.php | 33 ------------------- ..._20_222607_create_check_update_trigger.php | 33 ------------------- ...0_222736_create_check_rfinsert_trigger.php | 33 ------------------- ...0_222836_create_check_rfupdate_trigger.php | 33 ------------------- ...20_222936_create_insert_hashes_trigger.php | 33 ------------------- ...20_223037_create_update_hashes_trigger.php | 33 ------------------- ...20_223131_create_delete_hashes_trigger.php | 33 ------------------- 11 files changed, 32 insertions(+), 236 deletions(-) delete mode 100644 database/migrations/2018_12_20_221744_create_check_insert_trigger.php delete mode 100644 database/migrations/2018_12_20_222607_create_check_update_trigger.php delete mode 100644 database/migrations/2018_12_20_222736_create_check_rfinsert_trigger.php delete mode 100644 database/migrations/2018_12_20_222836_create_check_rfupdate_trigger.php delete mode 100644 database/migrations/2018_12_20_222936_create_insert_hashes_trigger.php delete mode 100644 database/migrations/2018_12_20_223037_create_update_hashes_trigger.php delete mode 100644 database/migrations/2018_12_20_223131_create_delete_hashes_trigger.php diff --git a/composer.lock b/composer.lock index 0acfacd6d..4785c2d01 100644 --- a/composer.lock +++ b/composer.lock @@ -16489,16 +16489,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.0.9", + "version": "1.0.10", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "d7b223300d511145eea87fdabae1663c7c0088aa" + "reference": "71df77cad94aae4db904aaef1cc2f06950daed76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/d7b223300d511145eea87fdabae1663c7c0088aa", - "reference": "d7b223300d511145eea87fdabae1663c7c0088aa", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/71df77cad94aae4db904aaef1cc2f06950daed76", + "reference": "71df77cad94aae4db904aaef1cc2f06950daed76", "shasum": "" }, "require": { @@ -16572,7 +16572,7 @@ "type": "github" } ], - "time": "2022-03-11T14:19:27+00:00" + "time": "2022-03-17T11:01:36+00:00" }, { "name": "symfony/config", diff --git a/database/migrations/2018_01_20_195528_create_releases_table.php b/database/migrations/2018_01_20_195528_create_releases_table.php index 5b407c999..1cf078a0d 100644 --- a/database/migrations/2018_01_20_195528_create_releases_table.php +++ b/database/migrations/2018_01_20_195528_create_releases_table.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Triggers\Trigger; class CreateReleasesTable extends Migration { @@ -81,6 +82,13 @@ processed'); DB::statement('ALTER TABLE releases DROP PRIMARY KEY , ADD PRIMARY KEY (id, categories_id)'); DB::statement('ALTER TABLE releases ADD COLUMN nzb_guid BINARY(16) NULL'); DB::statement('ALTER TABLE releases ADD INDEX ix_releases_nzb_guid (nzb_guid)'); + + Trigger::table('releases')->key('check_insert')->beforeInsert(function () { + return 'IF NEW.searchname REGEXP "[a-fA-F0-9]{32}" OR NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; + }); + Trigger::table('releases')->key('check_update')->beforeUpdate(function () { + return 'IF NEW.searchname REGEXP "[a-fA-F0-9]{32}" OR NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; + }); } /** diff --git a/database/migrations/2018_01_20_195934_create_predb_table.php b/database/migrations/2018_01_20_195934_create_predb_table.php index 0fdcc4159..07cb18f2b 100644 --- a/database/migrations/2018_01_20_195934_create_predb_table.php +++ b/database/migrations/2018_01_20_195934_create_predb_table.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Triggers\Trigger; class CreatePredbTable extends Migration { @@ -33,6 +34,15 @@ class CreatePredbTable extends Migration $table->index(['requestid', 'groups_id'], 'ix_predb_requestid'); }); DB::statement('ALTER TABLE predb ADD FULLTEXT ft_predb_filename (filename)'); + Trigger::table('predb')->key('insert_hashes')->afterInsert(function () { + return 'INSERT INTO predb_hashes (hash, predb_id) VALUES (UNHEX(MD5(NEW.title)), NEW.id), (UNHEX(MD5(MD5(NEW.title))), NEW.id), (UNHEX(SHA1(NEW.title)), NEW.id), (UNHEX(SHA2(NEW.title, 256)), NEW.id), (UNHEX(MD5(CONCAT(NEW.title, NEW.requestid))), NEW.id), (UNHEX(MD5(CONCAT(NEW.title, NEW.requestid, NEW.requestid))), NEW.id);'; + }); + Trigger::table('predb')->key('update_hashes')->afterUpdate(function () { + return 'IF NEW.title != OLD.title THEN DELETE FROM predb_hashes WHERE hash IN ( UNHEX(md5(OLD.title)), UNHEX(md5(md5(OLD.title))), UNHEX(sha1(OLD.title)), UNHEX(sha2(OLD.title, 256)), UNHEX(MD5(CONCAT(OLD.title, OLD.requestid)))) AND predb_id = OLD.id; INSERT INTO predb_hashes (hash, predb_id) VALUES (UNHEX(MD5(NEW.title)), NEW.id), (UNHEX(MD5(MD5(NEW.title))), NEW.id), (UNHEX(SHA1(NEW.title)), NEW.id), (UNHEX(SHA2(NEW.title, 256)), NEW.id), (UNHEX(MD5(CONCAT((NEW.title, NEW.requestid)))), NEW.id), (UNHEX(MD5(CONCAT(NEW.title, NEW.requestid, NEW.requestid))), NEW.id);END IF;'; + }); + Trigger::table('predb')->key('delete_hashes')->afterDelete(function () { + return 'DELETE FROM predb_hashes WHERE hash IN ( UNHEX(md5(OLD.title)), UNHEX(md5(md5(OLD.title))), UNHEX(sha1(OLD.title)), UNHEX(sha2(OLD.title, 256)), UNHEX(MD5(CONCAT(OLD.title, OLD.requestid))), UNHEX(MD5(CONCAT(OLD.title, OLD.requestid, OLD.requestid)))) AND predb_id = OLD.id;'; + }); } /** diff --git a/database/migrations/2018_01_20_200056_create_release_files_table.php b/database/migrations/2018_01_20_200056_create_release_files_table.php index 784d30258..e69903b5a 100644 --- a/database/migrations/2018_01_20_200056_create_release_files_table.php +++ b/database/migrations/2018_01_20_200056_create_release_files_table.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Triggers\Trigger; class CreateReleaseFilesTable extends Migration { @@ -26,6 +27,14 @@ class CreateReleaseFilesTable extends Migration $table->primary(['releases_id', 'name']); $table->foreign('releases_id', 'FK_rf_releases')->references('id')->on('releases')->onUpdate('CASCADE')->onDelete('CASCADE'); }); + + Trigger::table('release_files')->key('check_rfinsert')->beforeInsert(function () { + return 'IF NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; + }); + + Trigger::table('release_files')->key('check_rfupdate')->beforeUpdate(function () { + return 'IF NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; + }); } /** diff --git a/database/migrations/2018_12_20_221744_create_check_insert_trigger.php b/database/migrations/2018_12_20_221744_create_check_insert_trigger.php deleted file mode 100644 index 2774c9ba3..000000000 --- a/database/migrations/2018_12_20_221744_create_check_insert_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('releases') - ->statement(function () { - return 'IF NEW.searchname REGEXP "[a-fA-F0-9]{32}" OR NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; - }) - ->before() - ->insert(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('releases.check_insert'); - } -} diff --git a/database/migrations/2018_12_20_222607_create_check_update_trigger.php b/database/migrations/2018_12_20_222607_create_check_update_trigger.php deleted file mode 100644 index 915009da9..000000000 --- a/database/migrations/2018_12_20_222607_create_check_update_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('releases') - ->statement(function () { - return 'IF NEW.searchname REGEXP "[a-fA-F0-9]{32}" OR NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; - }) - ->before() - ->update(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('releases.check_update'); - } -} diff --git a/database/migrations/2018_12_20_222736_create_check_rfinsert_trigger.php b/database/migrations/2018_12_20_222736_create_check_rfinsert_trigger.php deleted file mode 100644 index b6d406ecc..000000000 --- a/database/migrations/2018_12_20_222736_create_check_rfinsert_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('release_files') - ->statement(function () { - return 'IF NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; - }) - ->before() - ->insert(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('release_files.check_rfinsert'); - } -} diff --git a/database/migrations/2018_12_20_222836_create_check_rfupdate_trigger.php b/database/migrations/2018_12_20_222836_create_check_rfupdate_trigger.php deleted file mode 100644 index 9cde3dfb2..000000000 --- a/database/migrations/2018_12_20_222836_create_check_rfupdate_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('release_files') - ->statement(function () { - return 'IF NEW.name REGEXP "[a-fA-F0-9]{32}" THEN SET NEW.ishashed = 1; END IF;'; - }) - ->before() - ->update(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('release_files.check_rfupdate'); - } -} diff --git a/database/migrations/2018_12_20_222936_create_insert_hashes_trigger.php b/database/migrations/2018_12_20_222936_create_insert_hashes_trigger.php deleted file mode 100644 index 8c1f34f6b..000000000 --- a/database/migrations/2018_12_20_222936_create_insert_hashes_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('predb') - ->statement(function () { - return 'INSERT INTO predb_hashes (hash, predb_id) VALUES (UNHEX(MD5(NEW.title)), NEW.id), (UNHEX(MD5(MD5(NEW.title))), NEW.id), (UNHEX(SHA1(NEW.title)), NEW.id), (UNHEX(SHA2(NEW.title, 256)), NEW.id), (UNHEX(MD5(CONCAT(NEW.title, NEW.requestid))), NEW.id), (UNHEX(MD5(CONCAT(NEW.title, NEW.requestid, NEW.requestid))), NEW.id);'; - }) - ->after() - ->insert(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('predb.insert_hashes'); - } -} diff --git a/database/migrations/2018_12_20_223037_create_update_hashes_trigger.php b/database/migrations/2018_12_20_223037_create_update_hashes_trigger.php deleted file mode 100644 index a95b5e0a1..000000000 --- a/database/migrations/2018_12_20_223037_create_update_hashes_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('predb') - ->statement(function () { - return 'IF NEW.title != OLD.title THEN DELETE FROM predb_hashes WHERE hash IN ( UNHEX(md5(OLD.title)), UNHEX(md5(md5(OLD.title))), UNHEX(sha1(OLD.title)), UNHEX(sha2(OLD.title, 256)), UNHEX(MD5(CONCAT(OLD.title, OLD.requestid)))) AND predb_id = OLD.id; INSERT INTO predb_hashes (hash, predb_id) VALUES (UNHEX(MD5(NEW.title)), NEW.id), (UNHEX(MD5(MD5(NEW.title))), NEW.id), (UNHEX(SHA1(NEW.title)), NEW.id), (UNHEX(SHA2(NEW.title, 256)), NEW.id), (UNHEX(MD5(CONCAT((NEW.title, NEW.requestid)))), NEW.id), (UNHEX(MD5(CONCAT(NEW.title, NEW.requestid, NEW.requestid))), NEW.id);END IF;'; - }) - ->after() - ->update(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('predb.update_hashes'); - } -} diff --git a/database/migrations/2018_12_20_223131_create_delete_hashes_trigger.php b/database/migrations/2018_12_20_223131_create_delete_hashes_trigger.php deleted file mode 100644 index 440fa4ecf..000000000 --- a/database/migrations/2018_12_20_223131_create_delete_hashes_trigger.php +++ /dev/null @@ -1,33 +0,0 @@ -on('predb') - ->statement(function () { - return 'DELETE FROM predb_hashes WHERE hash IN ( UNHEX(md5(OLD.title)), UNHEX(md5(md5(OLD.title))), UNHEX(sha1(OLD.title)), UNHEX(sha2(OLD.title, 256)), UNHEX(MD5(CONCAT(OLD.title, OLD.requestid))), UNHEX(MD5(CONCAT(OLD.title, OLD.requestid, OLD.requestid)))) AND predb_id = OLD.id;'; - }) - ->after() - ->delete(); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('predb.delete_hashes'); - } -}