friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4240 from annando/sql-definition 

SQL structure had changed
This commit is contained in:
Hypolite Petovan 2018-01-15 07:37:13 -05:00 committed by GitHub
parent cb612c712d 5d03eb3dae
commit 35d334dd26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 610 additions and 610 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1216
database.sql
View File

File diff suppressed because it is too large Load Diff

4
src/Database/DBStructure.php
View File

@ -129,8 +129,8 @@ class DBStructure {
if (DBM::is_result($structures)) {
foreach ($structures AS $field) {
// Replace the default size values so that we don't have to define them
$search = ['tinyint(1)', 'tinyint(4)', 'smallint(6)', 'mediumint(9)', 'bigint(20)', 'int(11)'];
$replace = ['boolean', 'tinyint', 'smallint', 'mediumint', 'bigint', 'int'];
$search = ['tinyint(1)', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(9)', 'bigint(20)', 'int(11)'];
$replace = ['boolean', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint', 'bigint', 'int'];
$field["Type"] = str_replace($search, $replace, $field["Type"]);
$fielddata[$field["Field"]]["type"] = $field["Type"];