rewrite attach/morph queries to cope for saved data containing replac…

…ed plugin models classes
wintercms · Apr 22, 2021 · 745f205 · 745f205
1 parent eb489ff
commit 745f205
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Database/Relations/AttachOneOrMany.php b/src/Database/Relations/AttachOneOrMany.php
@@ -39,7 +39,14 @@ public function isPublic()
  public function addConstraints()
  {
  if (static::$constraints) {
- $this->query->where($this->morphType, $this->morphClass);
+ if (starts_with($this->morphClass, 'Winter\\')) {
+ $this->query->where(function ($q) {
+ $q->where($this->morphType, $this->morphClass);
+ $q->orWhere($this->morphType, str_replace('Winter\\', 'RainLab\\', $this->morphClass));
+ });
+ } else {
+ $this->query->where($this->morphType, $this->morphClass);
+ }
 
  $this->query->where($this->foreignKey, '=', $this->getParentKey());
 

diff --git a/src/Database/Relations/MorphOneOrMany.php b/src/Database/Relations/MorphOneOrMany.php
@@ -12,6 +12,26 @@ trait MorphOneOrMany
  */
  protected $relationName;
 
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ public function addConstraints()
+ {
+ if (static::$constraints) {
+ if (starts_with($this->morphClass, 'Winter\\')) {
+ $this->query->where(function ($q) {
+ $q->where($this->morphType, $this->morphClass);
+ $q->orWhere($this->morphType, str_replace('Winter\\', 'RainLab\\', $this->morphClass));
+ });
+ } else {
+ $this->query->where($this->morphType, $this->morphClass);
+ }
+ }
+ }
+
+
  /**
  * Save the supplied related model with deferred binding support.
  */