kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 10:16:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix #9781

Browse Source
This commit is contained in:
James Cole
2025-02-06 05:51:51 +01:00
parent a6d450ba18
commit d53b1670d3
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Helpers/Collector/Extensions/MetaCollection.php
View File

@@ -167,6 +167,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id'); $this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($externalId))); $this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($externalId)));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -405,7 +406,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->whereLike('journal_meta.data', sprintf('%%%s%%', $internalReference)); $this->query->whereLike('journal_meta.data', sprintf('%%%s%%', $internalReference));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -417,7 +418,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->whereNotLike('journal_meta.data', sprintf('%%%s%%', $internalReference)); $this->query->whereNotLike('journal_meta.data', sprintf('%%%s%%', $internalReference));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -429,7 +430,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->whereNotLike('journal_meta.data', sprintf('%%%s"', $internalReference)); $this->query->whereNotLike('journal_meta.data', sprintf('%%%s"', $internalReference));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -441,7 +442,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference)); $this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -453,7 +454,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->whereLike('journal_meta.data', sprintf('%%%s"', $internalReference)); $this->query->whereLike('journal_meta.data', sprintf('%%%s"', $internalReference));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -465,7 +466,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference)); $this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -697,7 +698,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id'); $this->query->where('journal_meta.name', '=', 'external_id');
$this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($externalId))); $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($externalId)));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -706,7 +707,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_url'); $this->query->where('journal_meta.name', '=', 'external_url');
$this->query->where('journal_meta.data', '=', json_encode($url)); $this->query->where('journal_meta.data', '=', json_encode($url));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -718,7 +719,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.name', '=', 'internal_reference');
$this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($internalReference))); $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($internalReference)));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -727,7 +728,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'recurrence_id'); $this->query->where('journal_meta.name', '=', 'recurrence_id');
$this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($recurringId))); $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($recurringId)));
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -862,6 +863,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_id'); $this->query->where('journal_meta.name', '=', 'external_id');
$this->query->whereNotNull('journal_meta.data'); $this->query->whereNotNull('journal_meta.data');
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -871,6 +873,7 @@ trait MetaCollection
$this->joinMetaDataTables(); $this->joinMetaDataTables();
$this->query->where('journal_meta.name', '=', 'external_url'); $this->query->where('journal_meta.name', '=', 'external_url');
$this->query->whereNotNull('journal_meta.data'); $this->query->whereNotNull('journal_meta.data');
$this->query->whereNull('journal_meta.deleted_at');
return $this; return $this;
} }
@@ -915,10 +918,13 @@ trait MetaCollection
$q1->where(static function (Builder $q2): void { $q1->where(static function (Builder $q2): void {
$q2->where('journal_meta.name', '=', 'external_id'); $q2->where('journal_meta.name', '=', 'external_id');
$q2->whereNull('journal_meta.data'); $q2->whereNull('journal_meta.data');
$q2->whereNull('journal_meta.deleted_at');
})->orWhere(static function (Builder $q3): void { })->orWhere(static function (Builder $q3): void {
$q3->where('journal_meta.name', '!=', 'external_id'); $q3->where('journal_meta.name', '!=', 'external_id');
$q3->whereNull('journal_meta.deleted_at');
})->orWhere(static function (Builder $q4): void { })->orWhere(static function (Builder $q4): void {
$q4->whereNull('journal_meta.name'); $q4->whereNull('journal_meta.name');
$q4->whereNull('journal_meta.deleted_at');
}); });
}); });
@@ -933,10 +939,13 @@ trait MetaCollection
$q1->where(static function (Builder $q2): void { $q1->where(static function (Builder $q2): void {
$q2->where('journal_meta.name', '=', 'external_url'); $q2->where('journal_meta.name', '=', 'external_url');
$q2->whereNull('journal_meta.data'); $q2->whereNull('journal_meta.data');
$q2->whereNull('journal_meta.deleted_at');
})->orWhere(static function (Builder $q3): void { })->orWhere(static function (Builder $q3): void {
$q3->where('journal_meta.name', '!=', 'external_url'); $q3->where('journal_meta.name', '!=', 'external_url');
$q3->whereNull('journal_meta.deleted_at');
})->orWhere(static function (Builder $q4): void { })->orWhere(static function (Builder $q4): void {
$q4->whereNull('journal_meta.name'); $q4->whereNull('journal_meta.name');
$q4->whereNull('journal_meta.deleted_at');
}); });
}); });