From 1cad734b08e6513112b8bc7a15f28e379aa634ee Mon Sep 17 00:00:00 2001 From: overflowerror Date: Fri, 8 Jan 2021 17:52:36 +0100 Subject: [PATCH] fixed ondelete constraint, deleted migrations, switched to mysql --- .env | 4 +- migrations/Version20210105173153.php | 31 ---------- migrations/Version20210105182816.php | 42 ------------- migrations/Version20210105203326.php | 46 -------------- migrations/Version20210105203852.php | 45 -------------- migrations/Version20210105205256.php | 50 ---------------- migrations/Version20210105224915.php | 63 -------------------- migrations/Version20210106134556.php | 67 --------------------- migrations/Version20210106214136.php | 81 ------------------------- migrations/Version20210106214257.php | 83 -------------------------- migrations/Version20210107174149.php | 83 -------------------------- migrations/Version20210107200117.php | 89 ---------------------------- public/css/base.css | 4 ++ src/Entity/Video.php | 36 ----------- src/Entity/VideoLink.php | 6 +- src/Entity/View.php | 4 +- templates/base.html.twig | 2 +- 17 files changed, 12 insertions(+), 724 deletions(-) delete mode 100644 migrations/Version20210105173153.php delete mode 100644 migrations/Version20210105182816.php delete mode 100644 migrations/Version20210105203326.php delete mode 100644 migrations/Version20210105203852.php delete mode 100644 migrations/Version20210105205256.php delete mode 100644 migrations/Version20210105224915.php delete mode 100644 migrations/Version20210106134556.php delete mode 100644 migrations/Version20210106214136.php delete mode 100644 migrations/Version20210106214257.php delete mode 100644 migrations/Version20210107174149.php delete mode 100644 migrations/Version20210107200117.php diff --git a/.env b/.env index d2acfa1..2139637 100644 --- a/.env +++ b/.env @@ -26,7 +26,7 @@ APP_SECRET=239e52d8994dcde0214df503b8d4fbad # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml # -DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" -# DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7" +# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" +DATABASE_URL="mysql://mytube:mytube@127.0.0.1:3306/mytube?serverVersion=mariadb-10.3.24" #DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8" ###< doctrine/doctrine-bundle ### diff --git a/migrations/Version20210105173153.php b/migrations/Version20210105173153.php deleted file mode 100644 index 8e0351f..0000000 --- a/migrations/Version20210105173153.php +++ /dev/null @@ -1,31 +0,0 @@ -addSql('CREATE TABLE user (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, name VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL)'); - } - - public function down(Schema $schema) : void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE user'); - } -} diff --git a/migrations/Version20210105182816.php b/migrations/Version20210105182816.php deleted file mode 100644 index 99fb9ca..0000000 --- a/migrations/Version20210105182816.php +++ /dev/null @@ -1,42 +0,0 @@ -addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - )'); - $this->addSql('INSERT INTO user (id, name, password) SELECT id, name, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, password VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL COLLATE BINARY)'); - $this->addSql('INSERT INTO user (id, name, password) SELECT id, name, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - } -} diff --git a/migrations/Version20210105203326.php b/migrations/Version20210105203326.php deleted file mode 100644 index eaf3553..0000000 --- a/migrations/Version20210105203326.php +++ /dev/null @@ -1,46 +0,0 @@ -addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id CHAR(36) NOT NULL --(DC2Type:uuid) - , password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - )'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL)'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } -} diff --git a/migrations/Version20210105203852.php b/migrations/Version20210105203852.php deleted file mode 100644 index 2c4aeca..0000000 --- a/migrations/Version20210105203852.php +++ /dev/null @@ -1,45 +0,0 @@ -addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL)'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } -} diff --git a/migrations/Version20210105205256.php b/migrations/Version20210105205256.php deleted file mode 100644 index dd975c0..0000000 --- a/migrations/Version20210105205256.php +++ /dev/null @@ -1,50 +0,0 @@ -addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , PRIMARY KEY(id))'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE video'); - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - } -} diff --git a/migrations/Version20210105224915.php b/migrations/Version20210105224915.php deleted file mode 100644 index f16ab11..0000000 --- a/migrations/Version20210105224915.php +++ /dev/null @@ -1,63 +0,0 @@ -addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL COLLATE BINARY, description VARCHAR(1024) NOT NULL COLLATE BINARY, tags CLOB NOT NULL COLLATE BINARY --(DC2Type:array) - , state INTEGER NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_7CC7DA2C16678C77 FOREIGN KEY (uploader_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags) SELECT id, uploader_id, uploaded, name, description, tags FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , uploader_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags) SELECT id, uploader_id, uploaded, name, description, tags FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - } -} diff --git a/migrations/Version20210106134556.php b/migrations/Version20210106134556.php deleted file mode 100644 index b6c5f70..0000000 --- a/migrations/Version20210106134556.php +++ /dev/null @@ -1,67 +0,0 @@ -addSql('CREATE TABLE video_link (id BLOB NOT NULL, video_id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , mode INTEGER NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL COLLATE BINARY, description VARCHAR(1024) NOT NULL COLLATE BINARY, tags CLOB NOT NULL COLLATE BINARY --(DC2Type:array) - , state INTEGER NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_7CC7DA2C16678C77 FOREIGN KEY (uploader_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE video_link'); - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , state INTEGER NOT NULL, uploader_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - } -} diff --git a/migrations/Version20210106214136.php b/migrations/Version20210106214136.php deleted file mode 100644 index 255c58a..0000000 --- a/migrations/Version20210106214136.php +++ /dev/null @@ -1,81 +0,0 @@ -addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL COLLATE BINARY, description VARCHAR(1024) NOT NULL COLLATE BINARY, tags CLOB NOT NULL COLLATE BINARY --(DC2Type:array) - , state INTEGER NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_7CC7DA2C16678C77 FOREIGN KEY (uploader_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, created FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_313BC42D29C1004E FOREIGN KEY (video_id) REFERENCES video (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_313BC42D61220EA6 FOREIGN KEY (creator_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video_link (id, video_id, created) SELECT id, video_id, created FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , state INTEGER NOT NULL, uploader_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, created FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , video_id BLOB NOT NULL, mode INTEGER NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video_link (id, video_id, created) SELECT id, video_id, created FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - } -} diff --git a/migrations/Version20210106214257.php b/migrations/Version20210106214257.php deleted file mode 100644 index 5cdd891..0000000 --- a/migrations/Version20210106214257.php +++ /dev/null @@ -1,83 +0,0 @@ -addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL COLLATE BINARY, description VARCHAR(1024) NOT NULL COLLATE BINARY, tags CLOB NOT NULL COLLATE BINARY --(DC2Type:array) - , state INTEGER NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_7CC7DA2C16678C77 FOREIGN KEY (uploader_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, comment VARCHAR(1024) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_313BC42D29C1004E FOREIGN KEY (video_id) REFERENCES video (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_313BC42D61220EA6 FOREIGN KEY (creator_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video_link (id, video_id, creator_id, created, max_views, viewable_for, viewable_until) SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , state INTEGER NOT NULL, uploader_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video_link (id, video_id, creator_id, created, max_views, viewable_for, viewable_until) SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - } -} diff --git a/migrations/Version20210107174149.php b/migrations/Version20210107174149.php deleted file mode 100644 index e70f2bc..0000000 --- a/migrations/Version20210107174149.php +++ /dev/null @@ -1,83 +0,0 @@ -addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL COLLATE BINARY, description VARCHAR(1024) NOT NULL COLLATE BINARY, tags CLOB NOT NULL COLLATE BINARY --(DC2Type:array) - , state INTEGER NOT NULL, length DOUBLE PRECISION DEFAULT NULL, transcoding_progress INTEGER DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_7CC7DA2C16678C77 FOREIGN KEY (uploader_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, comment VARCHAR(1024) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id), CONSTRAINT FK_313BC42D29C1004E FOREIGN KEY (video_id) REFERENCES video (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_313BC42D61220EA6 FOREIGN KEY (creator_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video_link (id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment) SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , state INTEGER NOT NULL, uploader_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state) SELECT id, uploader_id, uploaded, name, description, tags, state FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, comment VARCHAR(1024) DEFAULT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video_link (id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment) SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - } -} diff --git a/migrations/Version20210107200117.php b/migrations/Version20210107200117.php deleted file mode 100644 index c7f712e..0000000 --- a/migrations/Version20210107200117.php +++ /dev/null @@ -1,89 +0,0 @@ -addSql('CREATE TABLE "view" (id BLOB NOT NULL, video_id BLOB NOT NULL, link_id BLOB NOT NULL, timestamp DATETIME NOT NULL --(DC2Type:datetime_immutable) - , validated DATETIME DEFAULT NULL --(DC2Type:datetime_immutable) - , PRIMARY KEY(id))'); - $this->addSql('CREATE INDEX IDX_FEFDAB8E29C1004E ON "view" (video_id)'); - $this->addSql('CREATE INDEX IDX_FEFDAB8EADA40271 ON "view" (link_id)'); - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, password, name, roles FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, name VARCHAR(180) NOT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY --(DC2Type:json) - , PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, password, name, roles) SELECT id, password, name, roles FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state, length, transcoding_progress FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploader_id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL COLLATE BINARY, description VARCHAR(1024) NOT NULL COLLATE BINARY, tags CLOB NOT NULL COLLATE BINARY --(DC2Type:array) - , state INTEGER NOT NULL, length DOUBLE PRECISION DEFAULT NULL, transcoding_progress INTEGER NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_7CC7DA2C16678C77 FOREIGN KEY (uploader_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state, length, transcoding_progress) SELECT id, uploader_id, uploaded, name, description, tags, state, length, transcoding_progress FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, comment VARCHAR(1024) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id), CONSTRAINT FK_313BC42D29C1004E FOREIGN KEY (video_id) REFERENCES video (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_313BC42D61220EA6 FOREIGN KEY (creator_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO video_link (id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment) SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE "view"'); - $this->addSql('DROP INDEX UNIQ_8D93D6495E237E06'); - $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, name, roles, password FROM user'); - $this->addSql('DROP TABLE user'); - $this->addSql('CREATE TABLE user (id BLOB NOT NULL, name VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json) - , password VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO user (id, name, roles, password) SELECT id, name, roles, password FROM __temp__user'); - $this->addSql('DROP TABLE __temp__user'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_8D93D6495E237E06 ON user (name)'); - $this->addSql('DROP INDEX IDX_7CC7DA2C16678C77'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video AS SELECT id, uploader_id, uploaded, name, description, tags, state, length, transcoding_progress FROM video'); - $this->addSql('DROP TABLE video'); - $this->addSql('CREATE TABLE video (id BLOB NOT NULL, uploaded DATETIME NOT NULL --(DC2Type:datetime_immutable) - , name VARCHAR(255) NOT NULL, description VARCHAR(1024) NOT NULL, tags CLOB NOT NULL --(DC2Type:array) - , state INTEGER NOT NULL, length DOUBLE PRECISION DEFAULT NULL, uploader_id BLOB NOT NULL, transcoding_progress INTEGER DEFAULT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video (id, uploader_id, uploaded, name, description, tags, state, length, transcoding_progress) SELECT id, uploader_id, uploaded, name, description, tags, state, length, transcoding_progress FROM __temp__video'); - $this->addSql('DROP TABLE __temp__video'); - $this->addSql('CREATE INDEX IDX_7CC7DA2C16678C77 ON video (uploader_id)'); - $this->addSql('DROP INDEX IDX_313BC42D29C1004E'); - $this->addSql('DROP INDEX IDX_313BC42D61220EA6'); - $this->addSql('CREATE TEMPORARY TABLE __temp__video_link AS SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM video_link'); - $this->addSql('DROP TABLE video_link'); - $this->addSql('CREATE TABLE video_link (id BLOB NOT NULL, created DATETIME NOT NULL --(DC2Type:datetime_immutable) - , max_views INTEGER DEFAULT NULL, viewable_for INTEGER DEFAULT NULL, viewable_until DATETIME DEFAULT NULL, comment VARCHAR(1024) DEFAULT NULL, video_id BLOB NOT NULL, creator_id BLOB NOT NULL, PRIMARY KEY(id))'); - $this->addSql('INSERT INTO video_link (id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment) SELECT id, video_id, creator_id, created, max_views, viewable_for, viewable_until, comment FROM __temp__video_link'); - $this->addSql('DROP TABLE __temp__video_link'); - $this->addSql('CREATE INDEX IDX_313BC42D29C1004E ON video_link (video_id)'); - $this->addSql('CREATE INDEX IDX_313BC42D61220EA6 ON video_link (creator_id)'); - } -} diff --git a/public/css/base.css b/public/css/base.css index 003786b..25fed62 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -20,4 +20,8 @@ .container { position: relative; +} + +.customNavbar { + margin-right: auto; } \ No newline at end of file diff --git a/src/Entity/Video.php b/src/Entity/Video.php index 5967b86..02c3eb1 100644 --- a/src/Entity/Video.php +++ b/src/Entity/Video.php @@ -5,7 +5,6 @@ namespace App\Entity; use App\Repository\VideoRepository; use DateTimeImmutable; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Doctrine\UuidGenerator; use Ramsey\Uuid\UuidInterface; @@ -62,11 +61,6 @@ class Video */ private $state = self::QUEUED; - /** - * @ORM\OneToMany(targetEntity=VideoLink::class, mappedBy="video") - */ - private $videoLinks; - /** * @ORM\Column(type="float", nullable=true) */ @@ -179,36 +173,6 @@ class Video } } - /** - * @return Collection|VideoLink[] - */ - public function getVideoLinks(): Collection - { - return $this->videoLinks; - } - - public function addVideoLink(VideoLink $videoLink): self - { - if (!$this->videoLinks->contains($videoLink)) { - $this->videoLinks[] = $videoLink; - $videoLink->setVideo($this); - } - - return $this; - } - - public function removeVideoLink(VideoLink $videoLink): self - { - if ($this->videoLinks->removeElement($videoLink)) { - // set the owning side to null (unless already changed) - if ($videoLink->getVideo() === $this) { - $videoLink->setVideo(null); - } - } - - return $this; - } - public function getCustomId(): string { return $this->customId; diff --git a/src/Entity/VideoLink.php b/src/Entity/VideoLink.php index 9567393..1b6f924 100644 --- a/src/Entity/VideoLink.php +++ b/src/Entity/VideoLink.php @@ -24,8 +24,8 @@ class VideoLink private $customId; /** - * @ORM\ManyToOne(targetEntity=Video::class, inversedBy="videoLinks") - * @ORM\JoinColumn(nullable=false) + * @ORM\ManyToOne(targetEntity=Video::class) + * @ORM\JoinColumn(nullable=false, onDelete="CASCADE") */ private $video; @@ -55,7 +55,7 @@ class VideoLink /** * @ORM\ManyToOne(targetEntity=User::class) - * @ORM\JoinColumn(nullable=false) + * @ORM\JoinColumn(nullable=false, onDelete="CASCADE") */ private $creator; diff --git a/src/Entity/View.php b/src/Entity/View.php index faa3626..5227254 100644 --- a/src/Entity/View.php +++ b/src/Entity/View.php @@ -24,13 +24,13 @@ class View /** * @ORM\ManyToOne(targetEntity=Video::class) - * @ORM\JoinColumn(nullable=false) + * @ORM\JoinColumn(nullable=false, onDelete="CASCADE") */ private $video; /** * @ORM\ManyToOne(targetEntity=VideoLink::class) - * @ORM\JoinColumn(nullable=false) + * @ORM\JoinColumn(nullable=false, onDelete="CASCADE") */ private $link; diff --git a/templates/base.html.twig b/templates/base.html.twig index d0e262a..fa4fc47 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -32,7 +32,7 @@