From 1d89795fdaa204b436e511e85c80f31da97a8f21 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 25 Nov 2008 03:35:22 +0000
Subject: [PATCH] ENHANCEMENT: Added experimental support using (relname)Query
 methods to pass complex relations (those defined by methods) into
 searchfilter

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66583 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 search/filters/SearchFilter.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/search/filters/SearchFilter.php b/search/filters/SearchFilter.php
index b295bd083..75f30b831 100644
--- a/search/filters/SearchFilter.php
+++ b/search/filters/SearchFilter.php
@@ -82,6 +82,9 @@ abstract class SearchFilter extends Object {
 	 * @return string
 	 */
 	function getDbName() {
+		// Special handler for "NULL" relations
+		if($this->name == "NULL") return $this->name;
+		
 		// SRM: This code finds the table where the field named $this->name lives
 		// Todo: move to somewhere more appropriate, such as DataMapper, the magical class-to-be?
 		$candidateClass = $this->model;
@@ -140,6 +143,24 @@ abstract class SearchFilter extends Object {
 					$query->innerJoin($relationTable, "`$relationTable`.`$parentField` = `$parentBaseClass`.`ID`");
 					$query->leftJoin($componentClass, "`$relationTable`.`$componentField` = `$componentClass`.`ID`");
 					$this->model = $componentClass;
+				
+				// Experimental support for user-defined relationships via a "(relName)Query" method
+				// This will likely be dropped in 2.4 for a system that makes use of Lazy Data Lists.
+				} elseif($model->hasMethod($rel.'Query')) {
+					// Get the query representing the join - it should have "$ID" in the filter
+					$newQuery = $model->{"{$rel}Query"}();
+					if($newQuery) {
+						// Get the table to join to
+						$newModel = str_replace('`','',array_shift($newQuery->from));
+						// Get the filter to use on the join
+					 	$ancestry = $model->getClassAncestry();
+						$newFilter = "(" . str_replace('$ID', "`{$ancestry[0]}`.`ID`" , implode(") AND (", $newQuery->where) ) . ")";
+						$query->leftJoin($newModel, $newFilter);
+						$this->model = $newModel;
+					} else {
+						$this->name = "NULL";
+						return;
+					}
 				}
 			}
 		}