From a164195773350056c52cc41b9dfb3aa33a6cbbba Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Fri, 9 May 2025 11:59:12 +0400
Subject: [PATCH 1/2] Map inner/outer keys in relations

---
 resources/annotated.meta-storm.xml |  17 ++++
 resources/relations.meta-storm.xml | 150 ++++++++++++++++++++++++++++-
 tests/docker-compose.yml           |   3 -
 3 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml
index 5e1dfbc6..096ccec1 100644
--- a/resources/annotated.meta-storm.xml
+++ b/resources/annotated.meta-storm.xml
@@ -1,14 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <meta-storm xmlns="meta-storm">
     <definitions>
+        <!-- Embeddable Entity -->
         <classConstructor class="\Cycle\Annotated\Annotation\Embeddable" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
 
+        <!-- Foreign Key -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
     </definitions>
 </meta-storm>
diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml
index 7fd218fb..f623a548 100644
--- a/resources/relations.meta-storm.xml
+++ b/resources/relations.meta-storm.xml
@@ -1,26 +1,92 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <meta-storm xmlns="meta-storm">
     <definitions>
+        <!-- Belongs To -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
+        <!-- Has Many -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
+        <!-- Has One -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
+        <!-- Refers To -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
+        <!-- Many To Many -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
@@ -29,22 +95,100 @@
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- target innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="2" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="2">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- target outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="3" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="3">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <!-- through innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="4" targetInArray="value">
+            <properties xpath="$argument[1]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="4">
+            <properties xpath="$argument[1]"/>
+        </classConstructor>
+        <!-- through outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="5" targetInArray="value">
+            <properties xpath="$argument[1]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="5">
+            <properties xpath="$argument[1]"/>
+        </classConstructor>
 
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsToMorphed" argument="1">
+        <!-- Belongs To Morphed -->
+        <!-- target: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\MorphedHasMany" argument="1">
+        <!-- Morphed Has Many -->
+        <!-- target: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\MorphedHasOne" argument="1">
+        <!-- Morphed Has One -->
+        <!-- target: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1" targetInArray="value">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1">
+            <properties xpath="$containingClass"/>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="2">
+            <properties xpath="$argument[0]"/>
+        </classConstructor>
 
+        <!-- Embedded -->
+        <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Embedded" argument="0">
             <collection name="cycle/orm:entity-embeddable-class" argument="0" />
         </classConstructor>
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 7bbf8d8b..9c4b5111 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -3,7 +3,6 @@ version: "3"
 services:
   sqlserver:
     image: mcr.microsoft.com/mssql/server:2019-latest
-    restart: always
     ports:
       - "11433:1433"
     environment:
@@ -12,7 +11,6 @@ services:
 
   mysql_latest:
     image: mysql:8.0
-    restart: always
     command: --default-authentication-plugin=mysql_native_password
     ports:
       - "13306:3306"
@@ -23,7 +21,6 @@ services:
 
   postgres:
     image: postgres:12
-    restart: always
     ports:
       - "15432:5432"
     environment:

From f6735fa3fabdcbbc6e57365d5527c8839584d793 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Sat, 10 May 2025 00:09:55 +0400
Subject: [PATCH 2/2] Filter columns by attribute

---
 resources/annotated.meta-storm.xml |  18 ++--
 resources/relations.meta-storm.xml | 162 ++++++++++++++++-------------
 2 files changed, 100 insertions(+), 80 deletions(-)

diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml
index 096ccec1..24aeedb9 100644
--- a/resources/annotated.meta-storm.xml
+++ b/resources/annotated.meta-storm.xml
@@ -15,17 +15,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
     </definitions>
 </meta-storm>
diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml
index f623a548..079f7feb 100644
--- a/resources/relations.meta-storm.xml
+++ b/resources/relations.meta-storm.xml
@@ -9,17 +9,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\BelongsTo" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Has Many -->
@@ -30,17 +32,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasMany" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Has One -->
@@ -51,17 +55,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\HasOne" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Refers To -->
@@ -72,17 +78,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\RefersTo" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Many To Many -->
@@ -97,31 +105,35 @@
         </classConstructor>
         <!-- target innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="2" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="2">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- target outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="3" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="3">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- through innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="4" targetInArray="value">
-            <properties xpath="$argument[1]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="4">
-            <properties xpath="$argument[1]"/>
+            <properties xpath="$argument[1]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- through outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="5" targetInArray="value">
-            <properties xpath="$argument[1]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\ManyToMany" argument="5">
-            <properties xpath="$argument[1]"/>
+            <properties xpath="$argument[1]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Belongs To Morphed -->
@@ -132,17 +144,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Morphed Has Many -->
@@ -153,17 +167,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Morphed Has One -->
@@ -174,17 +190,19 @@
         </classConstructor>
         <!-- innerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1" targetInArray="value">
-            <properties xpath="$containingClass"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1">
-            <properties xpath="$containingClass"/>
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
         <!-- outerKey: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="2" targetInArray="value">
-            <properties xpath="$argument[0]"/>
-        </classConstructor>
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="2">
-            <properties xpath="$argument[0]"/>
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
         </classConstructor>
 
         <!-- Embedded -->