GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[TOOLS] Update bin/generate_entity_fields so it defaults nullable variables to null and handles null in varchars

This commit is contained in:
Hugo Sales 2021-12-26 22:08:39 +00:00 committed by Diogo Peralta Cordeiro
parent 7eff22d548
commit 0df423e84b
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/generate_entity_fields
View File

@ -47,18 +47,29 @@ foreach ($files as $file) {
$fields_code = []; $fields_code = [];
$methods_code = []; $methods_code = [];
foreach ($fields as $field) { foreach ($fields as $field) {
$nullable = !@$schema['fields'][$field]['not null'] ? '?' : ''; $field_schema = $schema['fields'][$field];
$type = types[$schema['fields'][$field]['type']]; $nullable = ($field_schema['not null'] ?? false) ? '' : '?';
$type = types[$field_schema['type']];
$type = $type !== '' ? $nullable . $type : $type; $type = $type !== '' ? $nullable . $type : $type;
$method_name = str_replace([' ', 'actor'], ['', 'Actor'], ucwords(str_replace('_', ' ', $field))); $method_name = str_replace([' ', 'actor'], ['', 'Actor'], ucwords(str_replace('_', ' ', $field)));
$default = $schema['fields'][$field]['default'] ?? null; $length = $field_schema['length'] ?? null;
$length = $schema['fields'][$field]['length'] ?? null;
$field_setter = \is_int($length) ? "\mb_substr(\${$field}, 0, $length)" : "\${$field}";
if (isset($default) && $nullable != '?' && $type != '\DateTimeInterface') { $field_setter = "\${$field}";
if (is_string($default)) { if (\is_int($length)) {
if ($nullable === '?') {
$field_setter = "\is_null(\${$field}) ? null : \mb_substr(\${$field}, 0, $length)";
} else {
$field_setter = "\mb_substr(\${$field}, 0, $length)";
}
}
if (($nullable === '?' || \array_key_exists('default', $field_schema)) && $type != '\DateTimeInterface') {
$default = $field_schema['default'] ?? null;
if (\is_string($default)) {
$default = "'{$default}'"; $default = "'{$default}'";
} elseif ($type == 'bool') { } elseif (\is_null($default)) {
$default = "null";
} elseif ($type === 'bool' || $type === '?bool') {
$default = $default ? 'true' : 'false'; $default = $default ? 'true' : 'false';
} }