Krutush
/
database
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getColumn sql and load ids fix

This commit is contained in:
sheychen 2018-06-22 10:13:23 +02:00
parent 3a36263208
commit 8b8ae19dd0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Model.php
View File

@ -355,20 +355,23 @@ class Model{
* Convert field to column * Convert field to column
* *
* @param string $field * @param string $field
* @param boolean $sql add table name and quote
* @return string * @return string
*/ */
public static function getColumn(string $field): string{ public static function getColumn(string $field, bool $sql = false): string{
$options = static::getOptions($field); $options = static::getOptions($field);
return isset($options['column']) ? $options['column'] : $field; $column = isset($options['column']) ? $options['column'] : $field;
return $sql ? '`'.static::TABLE.'`.`'.$column.'`' : $column;
} }
/** /**
* Get table ID (for find and findOrFail) * Get table ID (for find and findOrFail)
* *
* @param boolean $sql add table name and quote
* @return string * @return string
*/ */
public static function getID(): string{ public static function getID(bool $sql = false): string{
return static::getColumn(static::ID); return static::getColumn(static::ID, $sql);
} }
/** /**
@ -381,8 +384,7 @@ class Model{
$fields = static::getFields(); $fields = static::getFields();
$columns = []; $columns = [];
foreach ($fields as $field => $options) { foreach ($fields as $field => $options) {
$column = static::getColumn($field); $columns[] = static::getColumn($field, $sql);
$columns[] = $sql ? '`'.static::TABLE.'`.`'.$column.'`' : $column;
} }
return $columns; return $columns;
} }
@ -799,7 +801,7 @@ class Model{
foreach ($models as $current) { foreach ($models as $current) {
$ids[] = $current->{isset($foreign['for']) ? $foreign['for'] : $field}; $ids[] = $current->{isset($foreign['for']) ? $foreign['for'] : $field};
} }
$ids = array_unique($ids); $ids = array_values(array_unique($ids));
$foreigns = []; $foreigns = [];
foreach($model::all($ids, $model::getColumn(isset($foreign['field']) ? $foreign['field'] : $model::ID).' IN ( '.str_repeat('?, ', count($ids)-1).'? )') as $current){ foreach($model::all($ids, $model::getColumn(isset($foreign['field']) ? $foreign['field'] : $model::ID).' IN ( '.str_repeat('?, ', count($ids)-1).'? )') as $current){
$cid = $current->{isset($foreign['field']) ? $foreign['field'] : $model::ID}; $cid = $current->{isset($foreign['field']) ? $foreign['field'] : $model::ID};
@ -814,7 +816,7 @@ class Model{
if(isset($foreigns[$id])) if(isset($foreigns[$id]))
$current->set($field, $foreigns[$id]); $current->set($field, $foreigns[$id]);
else if(!isset($foreign['nullable']) || !$foreign['nullable']) else if(!isset($foreign['nullable']) || !$foreign['nullable'])
throw new DatabaseException('Null foreign model'); var_dump($ids);//throw new DatabaseException('Null foreign model');
else else
$current->set($field, null); $current->set($field, null);
} }