tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixes case insensitive search for postgres databases

Browse Source
This commit is contained in:
Jean-Fabien Barrois 2015-03-02 09:55:29 +13:00
parent bbe27999eb
commit f9d493dff5
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
forms/TreeDropdownField.php
View File

@ -431,27 +431,25 @@ class TreeDropdownField extends FormField {
$res = call_user_func($this->searchCallback, $this->sourceObject, $this->labelField, $this->search);
} else {
$sourceObject = $this->sourceObject;
$wheres = array();
$filters = array();
if(singleton($sourceObject)->hasDatabaseField($this->labelField)) {
$wheres[] = "\"$this->labelField\" LIKE '%$this->search%'";
$filters["{$this->labelField}:PartialMatch"] = $this->search;
} else {
if(singleton($sourceObject)->hasDatabaseField('Title')) {
$wheres[] = "\"Title\" LIKE '%$this->search%'";
$filters["Title:PartialMatch"] = $this->search;
}
if(singleton($sourceObject)->hasDatabaseField('Name')) {
$wheres[] = "\"Name\" LIKE '%$this->search%'";
$filters["Name:PartialMatch"] = $this->search;
}
}
if(!$wheres) {
}
if(empty($filters)) {
throw new InvalidArgumentException(sprintf(
'Cannot query by %s.%s, not a valid database column',
$sourceObject,
$this->labelField
));
}
$res = DataObject::get($this->sourceObject, implode(' OR ', $wheres));
$res = DataObject::get($this->sourceObject)->filterAny($filters);
}
if( $res ) {

24
tests/forms/TreeDropdownFieldTest.php
View File

@ -24,7 +24,7 @@ class TreeDropdownFieldTest extends SapphireTest {
$this->assertEquals(
(string)$firstResult[0],
$folder1Subfolder1->Name,
'FileTest-folder1-subfolder1 is found, nested under folder1'
$folder1Subfolder1->Name.' is found, nested under '.$folder1->Name
);
$subfolder = $this->objFromFixture('Folder','subfolder');
@ -33,7 +33,7 @@ class TreeDropdownFieldTest extends SapphireTest {
$this->assertEquals(
(string)$secondResult[0],
$subfolder->Name,
'FileTest-subfolder is found at root level'
$subfolder->Name.' is found at root level'
);
// other folders which don't contain the keyword 'sub' are not returned in search results
@ -43,7 +43,7 @@ class TreeDropdownFieldTest extends SapphireTest {
$this->assertEquals(
$noResult,
array(),
'FileTest-folder2 is not found'
$folder2.' is not found'
);
$field = new TreeDropdownField('TestTree', 'Test tree', 'File');
@ -60,7 +60,7 @@ class TreeDropdownFieldTest extends SapphireTest {
$this->assertEquals(
(string)$firstResult[0],
$folder1Subfolder1->Name,
'FileTest-folder1-subfolder1 is found, nested under folder1'
$folder1Subfolder1->Name.' is found, nested under '.$folder1->Name
);
// Looking for two files with 'sub' in their name, both under the same folder
@ -68,18 +68,28 @@ class TreeDropdownFieldTest extends SapphireTest {
$file2 = $this->objFromFixture('File','subfolderfile2');
$cssPath = 'ul.tree li#selector-TestTree-'.$subfolder->ID.' li#selector-TestTree-'.$file1->ID.' a';
$firstResult = $parser->getBySelector($cssPath);
$this->assertGreaterThan(
0,
count($firstResult),
$file1->Name.' with ID '.$file1->ID.' is in search results'
);
$this->assertEquals(
(string)$firstResult[0],
$file1->Name,
'TestFile1InSubfolder is found nested under subfolder'
$file1->Name.' is found nested under '.$subfolder->Name
);
$cssPath = 'ul.tree li#selector-TestTree-'.$subfolder->ID.' li#selector-TestTree-'.$file2->ID.' a';
$secondResult = $parser->getBySelector($cssPath);
$this->assertGreaterThan(
0,
count($secondResult),
$file2->Name.' with ID '.$file2->ID.' is in search results'
);
$this->assertEquals(
(string)$secondResult[0],
$file2->Name,
'TestFile2InSubfolder is found nested under subfolder'
$file2->Name.' is found nested under '.$subfolder->Name
);
// other files which don't include 'sub' are not returned in search results
@ -89,7 +99,7 @@ class TreeDropdownFieldTest extends SapphireTest {
$this->assertEquals(
$noResult,
array(),
'FileTest.txt is not found'
$file3->Name.' is not found'
);
}