pure-orm 4.0.2 → 4.1.4

package/coverage/lcov-report/dist/src/core.js.html

@@ -20,24 +20,24 @@
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">95.31% </span>
+        <span class="strong">98.9% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>183/192</span>
+        <span class='fraction'>270/273</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">86.61% </span>
+        <span class="strong">90.98% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>97/112</span>
+        <span class='fraction'>111/122</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">98.04% </span>
+        <span class="strong">100% </span>
         <span class="quiet">Functions</span>
-        <span class='fraction'>50/51</span>
+        <span class='fraction'>31/31</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">95.53% </span>
+        <span class="strong">98.8% </span>
         <span class="quiet">Lines</span>
-        <span class='fraction'>171/179</span>
+        <span class='fraction'>248/251</span>
       </div>
     </div>
     <p class="quiet">
@@ -379,59 +379,136 @@
 <a name='L331'></a><a href='#L331'>331</a>
 <a name='L332'></a><a href='#L332'>332</a>
 <a name='L333'></a><a href='#L333'>333</a>
-<a name='L334'></a><a href='#L334'>334</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">1793x</span>
-<span class="cline-any cline-yes">1580x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L334'></a><a href='#L334'>334</a>
+<a name='L335'></a><a href='#L335'>335</a>
+<a name='L336'></a><a href='#L336'>336</a>
+<a name='L337'></a><a href='#L337'>337</a>
+<a name='L338'></a><a href='#L338'>338</a>
+<a name='L339'></a><a href='#L339'>339</a>
+<a name='L340'></a><a href='#L340'>340</a>
+<a name='L341'></a><a href='#L341'>341</a>
+<a name='L342'></a><a href='#L342'>342</a>
+<a name='L343'></a><a href='#L343'>343</a>
+<a name='L344'></a><a href='#L344'>344</a>
+<a name='L345'></a><a href='#L345'>345</a>
+<a name='L346'></a><a href='#L346'>346</a>
+<a name='L347'></a><a href='#L347'>347</a>
+<a name='L348'></a><a href='#L348'>348</a>
+<a name='L349'></a><a href='#L349'>349</a>
+<a name='L350'></a><a href='#L350'>350</a>
+<a name='L351'></a><a href='#L351'>351</a>
+<a name='L352'></a><a href='#L352'>352</a>
+<a name='L353'></a><a href='#L353'>353</a>
+<a name='L354'></a><a href='#L354'>354</a>
+<a name='L355'></a><a href='#L355'>355</a>
+<a name='L356'></a><a href='#L356'>356</a>
+<a name='L357'></a><a href='#L357'>357</a>
+<a name='L358'></a><a href='#L358'>358</a>
+<a name='L359'></a><a href='#L359'>359</a>
+<a name='L360'></a><a href='#L360'>360</a>
+<a name='L361'></a><a href='#L361'>361</a>
+<a name='L362'></a><a href='#L362'>362</a>
+<a name='L363'></a><a href='#L363'>363</a>
+<a name='L364'></a><a href='#L364'>364</a>
+<a name='L365'></a><a href='#L365'>365</a>
+<a name='L366'></a><a href='#L366'>366</a>
+<a name='L367'></a><a href='#L367'>367</a>
+<a name='L368'></a><a href='#L368'>368</a>
+<a name='L369'></a><a href='#L369'>369</a>
+<a name='L370'></a><a href='#L370'>370</a>
+<a name='L371'></a><a href='#L371'>371</a>
+<a name='L372'></a><a href='#L372'>372</a>
+<a name='L373'></a><a href='#L373'>373</a>
+<a name='L374'></a><a href='#L374'>374</a>
+<a name='L375'></a><a href='#L375'>375</a>
+<a name='L376'></a><a href='#L376'>376</a>
+<a name='L377'></a><a href='#L377'>377</a>
+<a name='L378'></a><a href='#L378'>378</a>
+<a name='L379'></a><a href='#L379'>379</a>
+<a name='L380'></a><a href='#L380'>380</a>
+<a name='L381'></a><a href='#L381'>381</a>
+<a name='L382'></a><a href='#L382'>382</a>
+<a name='L383'></a><a href='#L383'>383</a>
+<a name='L384'></a><a href='#L384'>384</a>
+<a name='L385'></a><a href='#L385'>385</a>
+<a name='L386'></a><a href='#L386'>386</a>
+<a name='L387'></a><a href='#L387'>387</a>
+<a name='L388'></a><a href='#L388'>388</a>
+<a name='L389'></a><a href='#L389'>389</a>
+<a name='L390'></a><a href='#L390'>390</a>
+<a name='L391'></a><a href='#L391'>391</a>
+<a name='L392'></a><a href='#L392'>392</a>
+<a name='L393'></a><a href='#L393'>393</a>
+<a name='L394'></a><a href='#L394'>394</a>
+<a name='L395'></a><a href='#L395'>395</a>
+<a name='L396'></a><a href='#L396'>396</a>
+<a name='L397'></a><a href='#L397'>397</a>
+<a name='L398'></a><a href='#L398'>398</a>
+<a name='L399'></a><a href='#L399'>399</a>
+<a name='L400'></a><a href='#L400'>400</a>
+<a name='L401'></a><a href='#L401'>401</a>
+<a name='L402'></a><a href='#L402'>402</a>
+<a name='L403'></a><a href='#L403'>403</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">4339x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">213x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1793x</span>
-<span class="cline-any cline-yes">1793x</span>
-<span class="cline-any cline-yes">1793x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">1793x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">3611x</span>
-<span class="cline-any cline-yes">3611x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">1793x</span>
-<span class="cline-any cline-yes">201x</span>
+<span class="cline-any cline-yes">457x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">1793x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">227x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">392x</span>
+<span class="cline-any cline-yes">392x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">4796x</span>
+<span class="cline-any cline-yes">4796x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">4796x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">509x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -439,156 +516,200 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">1435x</span>
-<span class="cline-any cline-yes">1435x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1435x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">227x</span>
-<span class="cline-any cline-yes">227x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">42896x</span>
-<span class="cline-any cline-yes">42896x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">42896x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">42895x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">164x</span>
+<span class="cline-any cline-yes">164x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">163x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">495x</span>
+<span class="cline-any cline-yes">495x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">188x</span>
-<span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-yes">1434x</span>
-<span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">494x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-yes">188x</span>
-<span class="cline-any cline-yes">21304x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">102x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">509x</span>
+<span class="cline-any cline-yes">392x</span>
+<span class="cline-any cline-yes">392x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1246x</span>
-<span class="cline-any cline-yes">1246x</span>
-<span class="cline-any cline-yes">1246x</span>
-<span class="cline-any cline-yes">29445x</span>
-<span class="cline-any cline-yes">28144x</span>
-<span class="cline-any cline-yes">28144x</span>
-<span class="cline-any cline-yes">29445x</span>
-<span class="cline-any cline-yes">28597x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">848x</span>
-<span class="cline-any cline-yes">849x</span>
-<span class="cline-any cline-yes">849x</span>
-<span class="cline-any cline-yes">822x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">26x</span>
+<span class="cline-any cline-yes">509x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1291x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1246x</span>
-<span class="cline-any cline-yes">12590x</span>
-<span class="cline-any cline-yes">10448x</span>
+<span class="cline-any cline-yes">1459x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">49133x</span>
-<span class="cline-any cline-yes">2142x</span>
-<span class="cline-any cline-yes">1203x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">926x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">939x</span>
+<span class="cline-any cline-yes">926x</span>
+<span class="cline-any cline-yes">926x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1246x</span>
+<span class="cline-any cline-yes">925x</span>
+<span class="cline-any cline-yes">925x</span>
+<span class="cline-any cline-yes">925x</span>
+<span class="cline-any cline-yes">925x</span>
+<span class="cline-any cline-yes">148x</span>
+<span class="cline-any cline-yes">148x</span>
+<span class="cline-any cline-yes">148x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1246x</span>
-<span class="cline-any cline-yes">6559x</span>
-<span class="cline-any cline-yes">2788x</span>
-<span class="cline-any cline-yes">2788x</span>
-<span class="cline-any cline-yes">6559x</span>
-<span class="cline-any cline-yes">6150x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">409x</span>
-<span class="cline-any cline-yes">410x</span>
-<span class="cline-any cline-yes">410x</span>
-<span class="cline-any cline-yes">355x</span>
+<span class="cline-any cline-yes">148x</span>
+<span class="cline-any cline-yes">148x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">925x</span>
+<span class="cline-any cline-yes">925x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">54x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1246x</span>
-<span class="cline-any cline-yes">614x</span>
-<span class="cline-any cline-yes">75x</span>
-<span class="cline-any cline-yes">75x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">924x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">539x</span>
-<span class="cline-any cline-yes">539x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">147x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">539x</span>
-<span class="cline-any cline-yes">61x</span>
-<span class="cline-any cline-yes">61x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1459x</span>
+<span class="cline-any cline-yes">1291x</span>
+<span class="cline-any cline-yes">1291x</span>
+<span class="cline-any cline-yes">276x</span>
+<span class="cline-any cline-yes">276x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1110x</span>
-<span class="cline-any cline-yes">761x</span>
+<span class="cline-any cline-yes">1015x</span>
+<span class="cline-any cline-yes">1015x</span>
+<span class="cline-any cline-yes">726x</span>
+<span class="cline-any cline-yes">726x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">349x</span>
-<span class="cline-any cline-yes">228x</span>
-<span class="cline-any cline-yes">228x</span>
-<span class="cline-any cline-yes">149x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">79x</span>
-<span class="cline-any cline-yes">79x</span>
+<span class="cline-any cline-yes">168x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">168x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">2768x</span>
+<span class="cline-any cline-yes">2768x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">121x</span>
+<span class="cline-any cline-yes">565x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">121x</span>
+<span class="cline-any cline-yes">213x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">989x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">213x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">64x</span>
+<span class="cline-any cline-yes">64x</span>
+<span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">37x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">540x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">540x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">355x</span>
+<span class="cline-any cline-yes">355x</span>
+<span class="cline-any cline-yes">355x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">321x</span>
+<span class="cline-any cline-yes">321x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">355x</span>
+<span class="cline-any cline-yes">355x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">540x</span>
+<span class="cline-any cline-yes">538x</span>
+<span class="cline-any cline-yes">538x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -599,103 +720,120 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">188x</span>
-<span class="cline-any cline-yes">188x</span>
+<span class="cline-any cline-yes">125x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">188x</span>
-<span class="cline-any cline-yes">149x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">147x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">147x</span>
+<span class="cline-any cline-yes">147x</span>
+<span class="cline-any cline-yes">147x</span>
+<span class="cline-any cline-yes">147x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">188x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">64x</span>
+<span class="cline-any cline-yes">64x</span>
+<span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">64x</span>
+<span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">188x</span>
-<span class="cline-any cline-yes">1434x</span>
-<span class="cline-any cline-yes">1434x</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">213x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">565x</span>
+<span class="cline-any cline-yes">258x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">307x</span>
+<span class="cline-any cline-yes">562x</span>
+<span class="cline-any cline-yes">562x</span>
+<span class="cline-any cline-yes">562x</span>
+<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">551x</span>
+<span class="cline-any cline-yes">551x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">551x</span>
+<span class="cline-any cline-yes">540x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-yes">6747x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1434x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">188x</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-yes">6747x</span>
-<span class="cline-any cline-yes">6747x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">125x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">125x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -704,14 +842,14 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">227x</span>
+<span class="cline-any cline-yes">509x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">227x</span>
+<span class="cline-any cline-yes">509x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">"use strict";
 var __importDefault = (this &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >this.__importDefault)</span> || function (mod) {
     return (mod &amp;&amp; mod.__esModule) ? <span class="branch-0 cbranch-no" title="branch not covered" >mod </span>: { "default": mod };
@@ -724,7 +862,7 @@ const createCore = ({ entities: externalEntities }) =&gt; {
         const tableName = d.tableName;
         const displayName = d.displayName || (0, camelcase_1.default)(d.tableName);
         const collectionDisplayName = d.collectionDisplayName || `${displayName}s`;
-        const columns = (typeof d.columns === 'function' ? <span class="branch-0 cbranch-no" title="branch not covered" >d.columns() </span>: d.columns).map((d) =&gt; {
+        const columns = (typeof d.columns === 'function' ? d.columns() : d.columns).map((d) =&gt; {
             if (typeof d === 'string') {
                 return {
                     column: d,
@@ -740,19 +878,35 @@ const createCore = ({ entities: externalEntities }) =&gt; {
         const Model = d.Model;
         const Collection = d.Collection;
         const pkColumnsData = columns.filter((x) =&gt; x.primaryKey);
-        const _primaryKeys = pkColumnsData.map(<span class="fstat-no" title="function not covered" >(x</span>) =&gt; <span class="cstat-no" title="statement not covered" >x.column)</span>;
-        const primaryKeys = _primaryKeys.length &gt; 0 ? <span class="branch-0 cbranch-no" title="branch not covered" >_primaryKeys </span>: ['id'];
-        // Returns unique identifier of model (the values of the primary keys)
+        const _primaryKeys = pkColumnsData.map((x) =&gt; x.column);
+        const primaryKeys = _primaryKeys.length &gt; 0 ? _primaryKeys : ['id'];
         const getPkId = (model) =&gt; {
-            return primaryKeys
-                .map((key) =&gt; model[key])
-                .join('');
+            let id = '';
+            for (let i = 0; i &lt; primaryKeys.length; i++) {
+                const part = model[primaryKeys[i]];
+                <span class="missing-if-branch" title="else path not taken" >E</span>if (part !== void 0 &amp;&amp; part !== null) {
+                    id += String(part);
+                }
+            }
+            return id;
         };
-        const references = columns
-            .filter((x) =&gt; x.references)
-            .reduce((accum, item) =&gt; Object.assign({}, accum, {
-            [item.property]: item.references
-        }), {});
+        const references = {};
+        const referencesEntries = [];
+        for (const col of columns) {
+            if (col.references) {
+                references[col.property] = col.references;
+                referencesEntries.push({
+                    property: col.property,
+                    ModelClass: col.references
+                });
+            }
+        }
+        const columnToPropertyMap = new Map();
+        const propertyToColumnMap = new Map();
+        for (let i = 0; i &lt; columnNames.length; i++) {
+            columnToPropertyMap.set(columnNames[i], propertyNames[i]);
+            propertyToColumnMap.set(propertyNames[i], columnNames[i]);
+        }
         const selectColumnsClause = prefixedColumnNames
             .map((prefixed, index) =&gt; `"${tableName}".${columnNames[index]} as "${prefixed}"`)
             .join(', ');
@@ -769,7 +923,10 @@ const createCore = ({ entities: externalEntities }) =&gt; {
             primaryKeys,
             references,
             selectColumnsClause,
-            getPkId
+            getPkId,
+            columnToPropertyMap,
+            propertyToColumnMap,
+            referencesEntries
         };
     });
     const tableNameToEntityMap = entities.reduce((map, entity) =&gt; {
@@ -778,8 +935,8 @@ const createCore = ({ entities: externalEntities }) =&gt; {
     }, new Map());
     const getEntityByTableName = (tableName) =&gt; {
         const entity = tableNameToEntityMap.get(tableName);
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (!entity) {
-<span class="cstat-no" title="statement not covered" >            throw new Error(`Could not find entity for table ${tableName}`);</span>
+        if (!entity) {
+            throw new Error(`Could not find entity for table ${tableName}`);
         }
         return entity;
     };
@@ -789,208 +946,258 @@ const createCore = ({ entities: externalEntities }) =&gt; {
     }, new Map());
     const getEntityByModelClass = (Model) =&gt; {
         const entity = modelToEntityMap.get(Model);
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (!entity) {
-<span class="cstat-no" title="statement not covered" >            throw new Error(`Could not find entity for class ${Model}`);</span>
+        if (!entity) {
+            throw new Error(`Could not find entity for class ${Model}`);
         }
         return entity;
     };
     const getEntityByModel = (model) =&gt; {
         return getEntityByModelClass(model.constructor);
     };
-    /*
-     * In:
-     *  [
-     *    [Article {id: 32}, ArticleTag {id: 54}]
-     *    [Article {id: 32}, ArticleTag {id: 55}]
-     *  ]
-     * Out:
-     *  Article {id: 32, ArticleTags articleTags: [ArticleTag {id: 54}, ArticleTag {id: 55}]
-     */
-    const nestClump = (clump) =&gt; {
-        clump = clump.map((x) =&gt; Object.values(x));
-        const root = clump[0][0];
-        clump = clump.map((row) =&gt; row.filter((item, index) =&gt; index !== 0));
-        const built = { [getEntityByModel(root).displayName]: root };
-        let nodes = [root];
-        // Wowzer is this both CPU and Memory inefficient
-        clump.forEach((array) =&gt; {
-            array.forEach((_model) =&gt; {
-                const nodeAlreadySeen = nodes.find((x) =&gt; x.constructor.name === _model.constructor.name &amp;&amp;
-                    getEntityByModel(x).getPkId(x) ===
-                        getEntityByModel(_model).getPkId(_model));
-                const model = nodeAlreadySeen || _model;
-                const isNodeAlreadySeen = !!nodeAlreadySeen;
-                const nodePointingToIt = nodes.find((node) =&gt; {
-                    const indexes = Object.values(getEntityByModel(node).references)
-                        .map((x, i) =&gt; x === model.constructor ? i : null)
-                        .filter((x, i) =&gt; x != null);
-                    if (!indexes.length) {
-                        return false;
-                    }
-                    for (const index of indexes) {
-                        const property = Object.keys(getEntityByModel(node).references)[index];
-                        if (node[property] === model.id) {
-                            return true;
-                        }
-                    }
-                    return false;
-                });
-                // For first obj type which is has an instance in nodes array,
-                // get its index in nodes array
-                const indexOfOldestParent = array.reduce((answer, obj) =&gt; {
-                    if (answer != null) {
-                        return answer;
-                    }
-                    const index = nodes.findIndex((n) =&gt; n.constructor === obj.constructor);
-                    if (index !== -1) {
-                        return index;
-                    }
-                    return null;
-                }, null) || 0;
-                const parentHeirarchy = [
-                    root,
-                    ...nodes.slice(0, indexOfOldestParent + 1).reverse()
-                ];
-                const nodeItPointsTo = parentHeirarchy.find((parent) =&gt; {
-                    const indexes = Object.values(getEntityByModel(model).references)
-                        .map((x, i) =&gt; x === parent.constructor ? i : null)
-                        .filter((x, i) =&gt; x != null);
-                    if (!indexes.length) {
-                        return false;
-                    }
-                    for (const index of indexes) {
-                        const property = Object.keys(getEntityByModel(model).references)[index];
-                        if (model[property] === parent.id) {
-                            return true;
-                        }
-                    }
-                    return false;
-                });
-                if (isNodeAlreadySeen) {
-                    if (nodeItPointsTo &amp;&amp; !nodePointingToIt) {
-                        nodes = [model, ...nodes];
-                        return;
-                    }
-                    // If the nodePointingToIt (eg, parcel_event) is part of an
-                    // existing collection on this node (eg, parcel) which is a
-                    // nodeAlreadySeen, early return so we don't create it (parcel) on
-                    // the nodePointingToIt (parcel_event), since it (parcel) has been
-                    // shown to be the parent (of parcel_events).
-                    <span class="missing-if-branch" title="else path not taken" >E</span>if (nodePointingToIt) {
-                        const ec = model[getEntityByModel(nodePointingToIt)
-                            .collectionDisplayName];
-                        if (ec &amp;&amp; ec.models.find((m) =&gt; m === nodePointingToIt)) {
-                            nodes = [model, ...nodes];
-                            return;
-                        }
-                    }
+    const entityReferencePlans = new Map();
+    for (let i = 0; i &lt; entities.length; i++) {
+        const entity = entities[i];
+        const plans = new Array(entity.referencesEntries.length);
+        for (let j = 0; j &lt; entity.referencesEntries.length; j++) {
+            const ref = entity.referencesEntries[j];
+            plans[j] = {
+                property: ref.property,
+                targetEntity: getEntityByModelClass(ref.ModelClass)
+            };
+        }
+        entityReferencePlans.set(entity, plans);
+    }
+    const getPkIdFromRow = (row, primaryKeyRowKeys) =&gt; {
+        let id = '';
+        for (let i = 0; i &lt; primaryKeyRowKeys.length; i++) {
+            const part = row[primaryKeyRowKeys[i]];
+            if (part !== void 0 &amp;&amp; part !== null) {
+                id += String(part);
+            }
+        }
+        return id;
+    };
+    const buildEntityRowPlans = (sampleRow) =&gt; {
+        const plansByTable = new Map();
+        const tableOrder = [];
+        for (const text in sampleRow) {
+            <span class="missing-if-branch" title="if path not taken" >I</span>if (!Object.prototype.hasOwnProperty.call(sampleRow, text)) {
+<span class="cstat-no" title="statement not covered" >                continue;</span>
+            }
+            const hashIndex = text.indexOf('#');
+            if (hashIndex === -1) {
+                throw new Error('Column names must be namespaced to table');
+            }
+            const tableName = text.substring(0, hashIndex);
+            const column = text.substring(hashIndex + 1);
+            let plan = plansByTable.get(tableName);
+            if (!plan) {
+                const entity = getEntityByTableName(tableName);
+                const primaryKeyRowKeys = entity.primaryKeys.map((pk) =&gt; `${tableName}#${pk}`);
+                plan = {
+                    entity,
+                    columnPlans: [],
+                    primaryKeyRowKeys
+                };
+                plansByTable.set(tableName, plan);
+                tableOrder.push(tableName);
+            }
+            let propertyName = plan.entity.columnToPropertyMap.get(column);
+            if (!propertyName) {
+                if (column.startsWith('meta_')) {
+                    propertyName = (0, camelcase_1.default)(column);
                 }
-                if (nodePointingToIt) {
-                    nodePointingToIt[getEntityByModel(model).displayName] = model;
+                else {
+                    throw Error(`No property name for "${column}" in business object "${plan.entity.displayName}". Non-spec'd columns must begin with "meta_".`);
                 }
-                else if (nodeItPointsTo) {
-                    let collection = nodeItPointsTo[getEntityByModel(model).collectionDisplayName];
-                    if (collection) {
-                        collection.models.push(model);
-                    }
-                    else {
-                        const Collection = getEntityByModel(model).Collection;
-                        nodeItPointsTo[getEntityByModel(model).collectionDisplayName] =
-                            new Collection({
-                                models: [model]
-                            });
-                    }
+            }
+            plan.columnPlans.push({
+                rowKey: text,
+                propertyName
+            });
+        }
+        const orderedPlans = new Array(tableOrder.length);
+        for (let i = 0; i &lt; tableOrder.length; i++) {
+            orderedPlans[i] = plansByTable.get(tableOrder[i]);
+        }
+        return orderedPlans;
+    };
+    const materializeModelsFromRow = (row, entityRowPlans, rootScopedModelsByEntity, rowModels, rowModelPkIds, rowCreatedWithPkIndexes) =&gt; {
+        rowCreatedWithPkIndexes.length = 0;
+        for (let i = 0; i &lt; entityRowPlans.length; i++) {
+            const plan = entityRowPlans[i];
+            const pkId = getPkIdFromRow(row, plan.primaryKeyRowKeys);
+            rowModelPkIds[i] = pkId;
+            if (pkId) {
+                let modelsForEntity = rootScopedModelsByEntity.get(plan.entity);
+                if (!modelsForEntity) {
+                    modelsForEntity = new Map();
+                    rootScopedModelsByEntity.set(plan.entity, modelsForEntity);
                 }
                 else {
-                    <span class="missing-if-branch" title="else path not taken" >E</span>if (!getEntityByModel(model).getPkId(model)) {
-                        // If the join is fruitless; todo: add a test for this path
-                        return;
+                    const existing = modelsForEntity.get(pkId);
+                    if (existing) {
+                        rowModels[i] = existing;
+                        continue;
                     }
-<span class="cstat-no" title="statement not covered" >                    throw Error(`Could not find how this BO fits: ${JSON.stringify(model)} ${getEntityByModel(model).tableName}`);</span>
                 }
-                nodes = [model, ...nodes];
-            });
-        });
-        return built;
+            }
+            else <span class="missing-if-branch" title="else path not taken" >E</span>if (i !== 0) {
+                // No primary key means this is typically an outer-joined null row.
+                // Skip model construction for non-root entities since it cannot link.
+                rowModels[i] = void 0;
+                continue;
+            }
+            const props = {};
+            for (let j = 0; j &lt; plan.columnPlans.length; j++) {
+                const columnPlan = plan.columnPlans[j];
+                props[columnPlan.propertyName] = row[columnPlan.rowKey];
+            }
+            const model = new plan.entity.Model(props);
+            <span class="missing-if-branch" title="else path not taken" >E</span>if (pkId) {
+                // modelsForEntity is guaranteed to be initialized above for pk rows.
+                rootScopedModelsByEntity.get(plan.entity).set(pkId, model);
+                rowCreatedWithPkIndexes.push(i);
+            }
+            rowModels[i] = model;
+        }
+        return rowModels[0];
+    };
+    const getRootScopeKey = (row, rootEntity, rootPrimaryKeys) =&gt; {
+        let rootScopeKey = '';
+        for (let i = 0; i &lt; rootPrimaryKeys.length; i++) {
+            <span class="missing-if-branch" title="if path not taken" >I</span>if (i &gt; 0) {
+<span class="cstat-no" title="statement not covered" >                rootScopeKey += '@';</span>
+            }
+            const value = row[`${rootEntity.tableName}#${rootPrimaryKeys[i]}`];
+            rootScopeKey += value === void 0 || value === null ? <span class="branch-0 cbranch-no" title="branch not covered" >'' </span>: String(value);
+        }
+        return rootScopeKey;
+    };
+    const ensureRootScopeState = (rootScopeKey, rootScopeStateByKey) =&gt; {
+        let state = rootScopeStateByKey.get(rootScopeKey);
+        <span class="missing-if-branch" title="else path not taken" >E</span>if (!state) {
+            state = {
+                modelsByEntity: new Map()
+            };
+            rootScopeStateByKey.set(rootScopeKey, state);
+        }
+        return state;
+    };
+    const ensureCollectionMembership = (rootScopeState) =&gt; {
+        if (!rootScopeState.collectionMembership) {
+            rootScopeState.collectionMembership = new WeakMap();
+        }
+        return rootScopeState.collectionMembership;
+    };
+    const linkSourceToTarget = ({ sourceEntity, sourceModel, sourceModelPkId, targetEntity, targetModel, collectionMembership }) =&gt; {
+        sourceModel[targetEntity.displayName] =
+            targetModel;
+        let collection = targetModel[sourceEntity.collectionDisplayName];
+        if (!collection) {
+            const Collection = sourceEntity.Collection;
+            collection = new Collection({ models: [] });
+            targetModel[sourceEntity.collectionDisplayName] = collection;
+        }
+        let byCollection = collectionMembership.get(targetModel);
+        if (!byCollection) {
+            byCollection = new Map();
+            collectionMembership.set(targetModel, byCollection);
+        }
+        let memberIds = byCollection.get(sourceEntity);
+        if (!memberIds) {
+            memberIds = new Set();
+            byCollection.set(sourceEntity, memberIds);
+        }
+        if (!memberIds.has(sourceModelPkId)) {
+            collection.models.push(sourceModel);
+            memberIds.add(sourceModelPkId);
+        }
     };
     /*
-     * Clump array of flat objects into groups based on id of root
-     * In:
-     *  [
-     *    [Article {id: 32}, ArticleTag {id: 54}]
-     *    [Article {id: 32}, ArticleTag {id: 55}]
-     *    [Article {id: 33}, ArticleTag {id: 56}]
-     *  ]
-     * Out:
-     *  [
-     *    [
-     *      [Article {id: 32}, ArticleTag {id: 54}]
-     *      [Article {id: 32}, ArticleTag {id: 55}]
-     *    ]
-     *    [
-     *      [Article {id: 33}, ArticleTag {id: 56}]
-     *    ]
-     *  ]
+     * createFromDatabase architecture:
+     * 1) Compile row plans once (column -&gt; property mapping per entity/table).
+     * 2) Materialize models per row with scoped de-duplication by root scope key.
+     * 3) Index models by root scope + entity + entity primary key.
+     * 4) Link refs incrementally as new models appear.
+     * 5) Return root models in first-seen root scope order.
      */
-    const clumpIntoGroups = (processed) =&gt; {
-        const root = processed[0][0];
-        const rootBo = root.constructor;
-        const clumps = processed.reduce((accum, item) =&gt; {
-            const id = getEntityByModel(root)
-                .primaryKeys.map((key) =&gt; { var _a; return (_a = item.find((x) =&gt; x.constructor === rootBo)) === null || _a === void 0 ? <span class="branch-0 cbranch-no" title="branch not covered" >void 0 </span>: _a[key]; })
-                .join('@');
-            if (accum.has(id)) {
-                accum.set(id, [...accum.get(id), item]);
+    const createFromDatabase = (rows) =&gt; {
+        var _a;
+        const result = Array.isArray(rows) ? rows : [rows];
+        const len = result.length;
+        const entityRowPlans = buildEntityRowPlans(result[0]);
+        const selectedEntities = new Set();
+        for (let i = 0; i &lt; entityRowPlans.length; i++) {
+            selectedEntities.add(entityRowPlans[i].entity);
+        }
+        const applicableRefPlans = new Map();
+        for (let i = 0; i &lt; entityRowPlans.length; i++) {
+            const entity = entityRowPlans[i].entity;
+            const refs = entityReferencePlans.get(entity) || <span class="branch-1 cbranch-no" title="branch not covered" >[];</span>
+            const filteredRefs = refs.filter((ref) =&gt; selectedEntities.has(ref.targetEntity));
+            applicableRefPlans.set(entity, filteredRefs);
+        }
+        const rootEntity = entityRowPlans[0].entity;
+        const rootPrimaryKeys = rootEntity.primaryKeys;
+        const rootScopeOrder = [];
+        const rootModelsByScopeKey = new Map();
+        const rootScopeStateByKey = new Map();
+        let currentRootScopeKey = void 0;
+        let currentRootScopeState = void 0;
+        const rowModels = new Array(entityRowPlans.length);
+        const rowModelPkIds = new Array(entityRowPlans.length);
+        const rowCreatedWithPkIndexes = [];
+        // Phase 1: materialize and index model instances by root scope + entity.
+        for (let i = 0; i &lt; len; i++) {
+            const row = result[i];
+            const rootScopeKey = getRootScopeKey(row, rootEntity, rootPrimaryKeys);
+            let rootScopeState = currentRootScopeState;
+            if (!rootScopeState || rootScopeKey !== currentRootScopeKey) {
+                rootScopeState = ensureRootScopeState(rootScopeKey, rootScopeStateByKey);
+                currentRootScopeKey = rootScopeKey;
+                currentRootScopeState = rootScopeState;
             }
-            else {
-                accum.set(id, [item]);
+            const rootModel = materializeModelsFromRow(row, entityRowPlans, rootScopeState.modelsByEntity, rowModels, rowModelPkIds, rowCreatedWithPkIndexes);
+            if (!rootModelsByScopeKey.has(rootScopeKey)) {
+                rootScopeOrder.push(rootScopeKey);
+                rootModelsByScopeKey.set(rootScopeKey, rootModel);
             }
-            return accum;
-        }, new Map());
-        return [...clumps.values()];
-    };
-    const mapToBos = (objectified) =&gt; {
-        return Object.keys(objectified).map((tableName) =&gt; {
-            const entity = getEntityByTableName(tableName);
-            const propified = Object.keys(objectified[tableName]).reduce((obj, column) =&gt; {
-                let propertyName = entity.propertyNames[entity.columnNames.indexOf(column)];
-                <span class="missing-if-branch" title="if path not taken" >I</span>if (!propertyName) {
-<span class="cstat-no" title="statement not covered" >                    if (column.startsWith('meta_')) {</span>
-<span class="cstat-no" title="statement not covered" >                        propertyName = (0, camelcase_1.default)(column);</span>
+            for (let c = 0; c &lt; rowCreatedWithPkIndexes.length; c++) {
+                const j = rowCreatedWithPkIndexes[c];
+                const sourceModel = rowModels[j];
+                const sourceModelPkId = rowModelPkIds[j];
+                const sourceEntity = entityRowPlans[j].entity;
+                const refs = applicableRefPlans.get(sourceEntity);
+                if (!refs || refs.length === 0) {
+                    continue;
+                }
+                for (let r = 0; r &lt; refs.length; r++) {
+                    const ref = refs[r];
+                    const refId = sourceModel[ref.property];
+                    if (refId == null) {
+                        continue;
                     }
-                    else {
-<span class="cstat-no" title="statement not covered" >                        throw Error(`No property name for "${column}" in business object "${entity.displayName}". Non-spec'd columns must begin with "meta_".`);</span>
+                    const targetPkId = String(refId);
+                    const target = (_a = rootScopeState.modelsByEntity
+                        .get(ref.targetEntity)) === null || _a === void 0 ? void 0 : _a.get(targetPkId);
+                    if (target) {
+                        linkSourceToTarget({
+                            sourceEntity,
+                            sourceModel,
+                            sourceModelPkId,
+                            targetEntity: ref.targetEntity,
+                            targetModel: target,
+                            collectionMembership: ensureCollectionMembership(rootScopeState)
+                        });
                     }
                 }
-                obj[propertyName] = objectified[tableName][column];
-                return obj;
-            }, {});
-            return new entity.Model(propified);
-        });
-    };
-    /*
-     * Make objects (based on special table#column names) from flat database
-     * return value.
-     */
-    const objectifyDatabaseResult = (result) =&gt; {
-        return Object.keys(result).reduce((obj, text) =&gt; {
-            const tableName = text.split('#')[0];
-            const column = text.split('#')[1];
-            <span class="missing-if-branch" title="if path not taken" >I</span>if (!tableName || !column) {
-<span class="cstat-no" title="statement not covered" >                throw new Error('Column names must be namespaced to table');</span>
             }
-            obj[tableName] = obj[tableName] || {};
-            obj[tableName][column] = result[text];
-            return obj;
-        }, {});
-    };
-    const createFromDatabase = (rows) =&gt; {
-        const result = Array.isArray(rows) ? rows : <span class="branch-1 cbranch-no" title="branch not covered" >[rows];</span>
-        const objectified = result.map(objectifyDatabaseResult);
-        const boified = objectified.map(mapToBos);
-        const clumps = clumpIntoGroups(boified);
-        const nested = clumps.map(nestClump);
-        const models = nested.map((n) =&gt; Object.values(n)[0]);
+        }
+        const models = new Array(rootScopeOrder.length);
+        for (let i = 0; i &lt; rootScopeOrder.length; i++) {
+            models[i] = rootModelsByScopeKey.get(rootScopeOrder[i]);
+        }
         const Collection = getEntityByModel(models[0]).Collection;
         return new Collection({ models });
     };
@@ -1051,7 +1258,7 @@ exports.createCore = createCore;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Dec 23 2023 12:48:55 GMT-0500 (Eastern Standard Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sun Mar 01 2026 17:10:47 GMT-0500 (Eastern Standard Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>