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

API exists() no longer true for nullifyIfEmpty if empty string

Browse Source 
Optimise DBString::exists() to skip shortcodes
This commit is contained in:
Damian Mooyman 2017-04-03 16:29:48 +12:00
parent 2c5e482de0
commit 9be22701fd
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ORM/FieldType/DBHTMLText.php
View File

@ -242,4 +242,12 @@ class DBHTMLText extends DBText
} }
return null; return null;
} }
public function exists()
{
// Optimisation: don't process shortcode just for ->exists()
$value = $this->getValue();
// All truthy values and non-empty strings exist ('0' but not (int)0)
return $value || (is_string($value) && strlen($value));
}
} }

8
src/ORM/FieldType/DBHTMLVarchar.php
View File

@ -141,4 +141,12 @@ class DBHTMLVarchar extends DBVarchar
} }
return null; return null;
} }
public function exists()
{
// Optimisation: don't process shortcode just for ->exists()
$value = $this->getValue();
// All truthy values and non-empty strings exist ('0' but not (int)0)
return $value || (is_string($value) && strlen($value));
}
} }

5
src/ORM/FieldType/DBString.php
View File

@ -96,9 +96,8 @@ abstract class DBString extends DBField
public function exists() public function exists()
{ {
$value = $this->RAW(); $value = $this->RAW();
return $value // All truthy values exist // All truthy values and non-empty strings exist ('0' but not (int)0)
|| (is_string($value) && strlen($value)) // non-empty strings exist ('0' but not (int)0) return $value || (is_string($value) && strlen($value));
|| (!$this->getNullifyEmpty() && $value === ''); // Remove this stupid exemption in 4.0
} }
public function prepValueForDB($value) public function prepValueForDB($value)

4
tests/php/ORM/DBFieldTest.php
View File

@ -205,7 +205,7 @@ class DBFieldTest extends SapphireTest
$varcharField->setValue('abc'); $varcharField->setValue('abc');
$this->assertTrue($varcharField->exists()); $this->assertTrue($varcharField->exists());
$varcharField->setValue(''); $varcharField->setValue('');
$this->assertTrue($varcharField->exists()); $this->assertFalse($varcharField->exists());
$varcharField->setValue(null); $varcharField->setValue(null);
$this->assertFalse($varcharField->exists()); $this->assertFalse($varcharField->exists());
@ -223,7 +223,7 @@ class DBFieldTest extends SapphireTest
$textField->setValue('abc'); $textField->setValue('abc');
$this->assertTrue($textField->exists()); $this->assertTrue($textField->exists());
$textField->setValue(''); $textField->setValue('');
$this->assertTrue($textField->exists()); $this->assertFalse($textField->exists());
$textField->setValue(null); $textField->setValue(null);
$this->assertFalse($textField->exists()); $this->assertFalse($textField->exists());
} }