|
@@ -738,7 +738,7 @@ discard block |
|
|
block discarded – undo |
|
738
|
738
|
|
|
739
|
739
|
// create new or update existing |
|
740
|
740
|
if ($this->_isPhantom) { |
|
741
|
|
- DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class,'handleException']); |
|
|
741
|
+ DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class, 'handleException']); |
|
742
|
742
|
$primaryKey = $this->getPrimaryKey(); |
|
743
|
743
|
$insertID = DB::insertID(); |
|
744
|
744
|
$fields = static::getClassFields(); |
|
@@ -751,8 +751,8 @@ discard block |
|
|
block discarded – undo |
|
751
|
751
|
$this->_isNew = true; |
|
752
|
752
|
} elseif (count($set)) { |
|
753
|
753
|
DB::nonQuery((new Update())->setTable(static::$tableName)->set($set)->where( |
|
754
|
|
- sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string)$this->getPrimaryKeyValue()) |
|
755
|
|
- ), null, [static::class,'handleException']); |
|
|
754
|
+ sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string) $this->getPrimaryKeyValue()) |
|
|
755
|
+ ), null, [static::class, 'handleException']); |
|
756
|
756
|
|
|
757
|
757
|
$this->_isUpdated = true; |
|
758
|
758
|
} |
|
@@ -784,11 +784,11 @@ discard block |
|
|
block discarded – undo |
|
784
|
784
|
$recordValues = $this->_prepareRecordValues(); |
|
785
|
785
|
$set = static::_mapValuesToSet($recordValues); |
|
786
|
786
|
|
|
787
|
|
- DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleException']); |
|
|
787
|
+ DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleException']); |
|
788
|
788
|
} |
|
789
|
789
|
} |
|
790
|
790
|
|
|
791
|
|
- return static::delete((string)$this->getPrimaryKeyValue()); |
|
|
791
|
+ return static::delete((string) $this->getPrimaryKeyValue()); |
|
792
|
792
|
} |
|
793
|
793
|
|
|
794
|
794
|
/** |
|
@@ -799,7 +799,7 @@ discard block |
|
|
block discarded – undo |
|
799
|
799
|
*/ |
|
800
|
800
|
public static function delete($id): bool |
|
801
|
801
|
{ |
|
802
|
|
- DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class,'handleException']); |
|
|
802
|
+ DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class, 'handleException']); |
|
803
|
803
|
|
|
804
|
804
|
return DB::affectedRows() > 0; |
|
805
|
805
|
} |
|
@@ -852,7 +852,7 @@ discard block |
|
|
block discarded – undo |
|
852
|
852
|
{ |
|
853
|
853
|
static::init(); |
|
854
|
854
|
if (!static::fieldExists($field)) { |
|
855
|
|
- throw new Exception('getColumnName called on nonexisting column: ' . get_called_class().'->'.$field); |
|
|
855
|
+ throw new Exception('getColumnName called on nonexisting column: '.get_called_class().'->'.$field); |
|
856
|
856
|
} |
|
857
|
857
|
|
|
858
|
858
|
return static::$_classFields[get_called_class()][$field]['columnName']; |
|
@@ -1019,7 +1019,7 @@ discard block |
|
|
block discarded – undo |
|
1019
|
1019
|
// clear buffer (required for the next query to work without running fetchAll first |
|
1020
|
1020
|
$Statement->closeCursor(); |
|
1021
|
1021
|
|
|
1022
|
|
- return $Connection->query((string)$query); // now the query should finish with no error |
|
|
1022
|
+ return $Connection->query((string) $query); // now the query should finish with no error |
|
1023
|
1023
|
} else { |
|
1024
|
1024
|
return DB::handleException($e, $query, $queryLog); |
|
1025
|
1025
|
} |
|
@@ -1118,8 +1118,8 @@ discard block |
|
|
block discarded – undo |
|
1118
|
1118
|
|
|
1119
|
1119
|
// skip these because they are built in |
|
1120
|
1120
|
if (in_array($property->getName(), [ |
|
1121
|
|
- '_classFields','_classRelationships','_classBeforeSave','_classAfterSave','_fieldsDefined','_relationshipsDefined','_eventsDefined','_record','_validator' |
|
1122
|
|
- ,'_validationErrors','_isDirty','_isValid','fieldSetMapper','_convertedValues','_originalValues','_isPhantom','_wasPhantom','_isNew','_isUpdated','_relatedObjects' |
|
|
1121
|
+ '_classFields', '_classRelationships', '_classBeforeSave', '_classAfterSave', '_fieldsDefined', '_relationshipsDefined', '_eventsDefined', '_record', '_validator' |
|
|
1122
|
+ ,'_validationErrors', '_isDirty', '_isValid', 'fieldSetMapper', '_convertedValues', '_originalValues', '_isPhantom', '_wasPhantom', '_isNew', '_isUpdated', '_relatedObjects' |
|
1123
|
1123
|
])) { |
|
1124
|
1124
|
continue; |
|
1125
|
1125
|
} |
|
@@ -1313,7 +1313,7 @@ discard block |
|
|
block discarded – undo |
|
1313
|
1313
|
case 'boolean': |
|
1314
|
1314
|
{ |
|
1315
|
1315
|
if (!isset($this->_convertedValues[$field])) { |
|
1316
|
|
- $this->_convertedValues[$field] = (bool)$value; |
|
|
1316
|
+ $this->_convertedValues[$field] = (bool) $value; |
|
1317
|
1317
|
} |
|
1318
|
1318
|
|
|
1319
|
1319
|
return $this->_convertedValues[$field]; |
|
@@ -1549,7 +1549,7 @@ discard block |
|
|
block discarded – undo |
|
1549
|
1549
|
foreach ($order as $key => $value) { |
|
1550
|
1550
|
if (is_string($key)) { |
|
1551
|
1551
|
$columnName = static::_cn($key); |
|
1552
|
|
- $direction = strtoupper($value)=='DESC' ? 'DESC' : 'ASC'; |
|
|
1552
|
+ $direction = strtoupper($value) == 'DESC' ? 'DESC' : 'ASC'; |
|
1553
|
1553
|
} else { |
|
1554
|
1554
|
$columnName = static::_cn($value); |
|
1555
|
1555
|
$direction = 'ASC'; |