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

Merge branch '5' into 6

Browse Source
This commit is contained in:
github-actions 2024-10-20 23:36:45 +00:00
commit 4d26063850
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,8 @@ class DBBoolean extends DBField
{ {
public function __construct(?string $name = null, bool|int $defaultVal = 0) public function __construct(?string $name = null, bool|int $defaultVal = 0)
{ {
$this->defaultVal = ($defaultVal) ? 1 : 0; $defaultValue = $defaultVal ? 1 : 0;
$this->setDefaultValue($defaultValue);
parent::__construct($name); parent::__construct($name);
} }
@ -27,7 +28,7 @@ class DBBoolean extends DBField
'precision' => 1, 'precision' => 1,
'sign' => 'unsigned', 'sign' => 'unsigned',
'null' => 'not null', 'null' => 'not null',
'default' => $this->defaultVal, 'default' => $this->getDefaultValue(),
'arrayValue' => $this->arrayValue 'arrayValue' => $this->arrayValue
]; ];
$values = ['type' => 'boolean', 'parts' => $parts]; $values = ['type' => 'boolean', 'parts' => $parts];

1
src/ORM/FieldType/DBField.php
View File

@ -103,6 +103,7 @@ abstract class DBField extends ModelData implements DBIndexable
* Default value in the database. * Default value in the database.
* Might be overridden on DataObject-level, but still useful for setting defaults on * Might be overridden on DataObject-level, but still useful for setting defaults on
* already existing records after a db-build. * already existing records after a db-build.
* @deprecated 5.4.0 Use getDefaultValue() and setDefaultValue() instead
*/ */
protected mixed $defaultVal = null; protected mixed $defaultVal = null;

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

@ -13,7 +13,8 @@ class DBFloat extends DBField
{ {
public function __construct(?string $name = null, float|int $defaultVal = 0) public function __construct(?string $name = null, float|int $defaultVal = 0)
{ {
$this->defaultVal = is_float($defaultVal) ? $defaultVal : (float) 0; $defaultValue = is_float($defaultVal) ? $defaultVal : (float) 0;
$this->setDefaultValue($defaultValue);
parent::__construct($name); parent::__construct($name);
} }
@ -23,7 +24,7 @@ class DBFloat extends DBField
$parts = [ $parts = [
'datatype' => 'float', 'datatype' => 'float',
'null' => 'not null', 'null' => 'not null',
'default' => $this->defaultVal, 'default' => $this->getDefaultValue(),
'arrayValue' => $this->arrayValue 'arrayValue' => $this->arrayValue
]; ];
$values = ['type' => 'float', 'parts' => $parts]; $values = ['type' => 'float', 'parts' => $parts];

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

@ -16,7 +16,8 @@ class DBInt extends DBField
{ {
public function __construct(?string $name = null, int $defaultVal = 0) public function __construct(?string $name = null, int $defaultVal = 0)
{ {
$this->defaultVal = is_int($defaultVal) ? $defaultVal : 0; $defaultValue = is_int($defaultVal) ? $defaultVal : 0;
$this->setDefaultValue($defaultValue);
parent::__construct($name); parent::__construct($name);
} }
@ -44,7 +45,7 @@ class DBInt extends DBField
'datatype' => 'int', 'datatype' => 'int',
'precision' => 11, 'precision' => 11,
'null' => 'not null', 'null' => 'not null',
'default' => $this->defaultVal, 'default' => $this->getDefaultValue(),
'arrayValue' => $this->arrayValue 'arrayValue' => $this->arrayValue
]; ];
$values = ['type' => 'int', 'parts' => $parts]; $values = ['type' => 'int', 'parts' => $parts];