From 28b9343c775771e960de302dea4eab93add8a355 Mon Sep 17 00:00:00 2001 From: jo Date: Sun, 5 Jun 2022 23:19:03 +0200 Subject: [PATCH] fix(legacy): remove not null contraint when using default This fixes the inital schema creation to match as if the old migrations were always run. The third_party_track_references.file_id field should not have a not null constraint while have a default value to 0. --- api/libretime_api/legacy/migrations/sql/schema.sql | 2 +- .../models/airtime/map/ThirdPartyTrackReferencesTableMap.php | 2 +- legacy/application/models/airtime/om/BaseCcFiles.php | 2 +- legacy/application/models/airtime/om/BaseCcFilesQuery.php | 4 ++-- .../models/airtime/om/BaseThirdPartyTrackReferencesQuery.php | 4 ++-- legacy/build/schema.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/libretime_api/legacy/migrations/sql/schema.sql b/api/libretime_api/legacy/migrations/sql/schema.sql index 94a948486..801bea1d5 100644 --- a/api/libretime_api/legacy/migrations/sql/schema.sql +++ b/api/libretime_api/legacy/migrations/sql/schema.sql @@ -667,7 +667,7 @@ CREATE TABLE "third_party_track_references" "id" serial NOT NULL, "service" VARCHAR(256) NOT NULL, "foreign_id" VARCHAR(256), - "file_id" INTEGER DEFAULT 0 NOT NULL, + "file_id" INTEGER DEFAULT 0, "upload_time" TIMESTAMP, "status" VARCHAR(256), PRIMARY KEY ("id"), diff --git a/legacy/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php b/legacy/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php index 3b90ff4ff..f82cbaea5 100644 --- a/legacy/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php +++ b/legacy/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php @@ -42,7 +42,7 @@ class ThirdPartyTrackReferencesTableMap extends TableMap $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null); $this->addColumn('service', 'DbService', 'VARCHAR', true, 256, null); $this->addColumn('foreign_id', 'DbForeignId', 'VARCHAR', false, 256, null); - $this->addForeignKey('file_id', 'DbFileId', 'INTEGER', 'cc_files', 'id', true, null, 0); + $this->addForeignKey('file_id', 'DbFileId', 'INTEGER', 'cc_files', 'id', false, null, 0); $this->addColumn('upload_time', 'DbUploadTime', 'TIMESTAMP', false, null, null); $this->addColumn('status', 'DbStatus', 'VARCHAR', false, 256, null); // validators diff --git a/legacy/application/models/airtime/om/BaseCcFiles.php b/legacy/application/models/airtime/om/BaseCcFiles.php index 0e8ab96e2..ba2647ba9 100644 --- a/legacy/application/models/airtime/om/BaseCcFiles.php +++ b/legacy/application/models/airtime/om/BaseCcFiles.php @@ -7005,7 +7005,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->thirdPartyTrackReferencessScheduledForDeletion = clone $this->collThirdPartyTrackReferencess; $this->thirdPartyTrackReferencessScheduledForDeletion->clear(); } - $this->thirdPartyTrackReferencessScheduledForDeletion[]= clone $thirdPartyTrackReferences; + $this->thirdPartyTrackReferencessScheduledForDeletion[]= $thirdPartyTrackReferences; $thirdPartyTrackReferences->setCcFiles(null); } diff --git a/legacy/application/models/airtime/om/BaseCcFilesQuery.php b/legacy/application/models/airtime/om/BaseCcFilesQuery.php index 37e5ac6eb..2b5c1bc76 100644 --- a/legacy/application/models/airtime/om/BaseCcFilesQuery.php +++ b/legacy/application/models/airtime/om/BaseCcFilesQuery.php @@ -3315,7 +3315,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria * * @return CcFilesQuery The current query, for fluid interface */ - public function joinThirdPartyTrackReferences($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function joinThirdPartyTrackReferences($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('ThirdPartyTrackReferences'); @@ -3350,7 +3350,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria * * @return ThirdPartyTrackReferencesQuery A secondary query class using the current class as primary query */ - public function useThirdPartyTrackReferencesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function useThirdPartyTrackReferencesQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinThirdPartyTrackReferences($relationAlias, $joinType) diff --git a/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php b/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php index 86f0a174d..b988151eb 100644 --- a/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php +++ b/legacy/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php @@ -493,7 +493,7 @@ abstract class BaseThirdPartyTrackReferencesQuery extends ModelCriteria * * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface */ - public function joinCcFiles($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function joinCcFiles($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('CcFiles'); @@ -528,7 +528,7 @@ abstract class BaseThirdPartyTrackReferencesQuery extends ModelCriteria * * @return CcFilesQuery A secondary query class using the current class as primary query */ - public function useCcFilesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function useCcFilesQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinCcFiles($relationAlias, $joinType) diff --git a/legacy/build/schema.xml b/legacy/build/schema.xml index 86cf863e3..e901bc556 100644 --- a/legacy/build/schema.xml +++ b/legacy/build/schema.xml @@ -531,7 +531,7 @@ - +