extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix SQL error in update from 14.2 and before for newer MariaDB/MySQL

Browse Source 
they no longer silently cut of too long content for varchar columns
This commit is contained in:
Ralf Becker 2019-05-23 10:16:39 +02:00
parent 34efaaa274
commit cf4301a023
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/src/Db/Schema.php
View File

@ -165,7 +165,7 @@ class Schema
$columns = implode('-',$columns); $columns = implode('-',$columns);
if ($ignore_length_limit) $columns = preg_replace('/\(\d+\)/', '', $columns); if ($ignore_length_limit) $columns = preg_replace('/\(\d+\)/', '', $columns);
} }
if(is_array($indexs)){ if(is_array($indexs)){
foreach($indexs as $index) foreach($indexs as $index)
@ -696,6 +696,13 @@ class Schema
{ {
$value = $name; $value = $name;
// varchar or ascii column shortened, use substring to avoid error if current content is to long
if(in_array($old_table_def['fd'][$name]['type'], array('varchar', 'ascii')) &&
in_array($data['type'], array('varchar', 'ascii')) &&
$old_table_def['fd'][$name]['precision'] > $data['precision'])
{
$value = "SUBSTRING($value FROM 1 FOR ".(int)$data['precision'].')';
}
if ($this->sType == 'pgsql') // some postgres specific code if ($this->sType == 'pgsql') // some postgres specific code
{ {
// this is eg. necessary to change a varchar into an int column under postgres // this is eg. necessary to change a varchar into an int column under postgres
@ -709,13 +716,6 @@ class Schema
{ {
$value = "ENCODE($value,'escape')"; $value = "ENCODE($value,'escape')";
} }
// varchar or ascii column shortened, use substring to avoid error if current content is to long
elseif(in_array($old_table_def['fd'][$name]['type'], array('varchar', 'ascii')) &&
in_array($data['type'], array('varchar', 'ascii')) &&
$old_table_def['fd'][$name]['precision'] > $data['precision'])
{
$value = "SUBSTRING($value FROM 1 FOR ".(int)$data['precision'].')';
}
// cast everything which is a different type // cast everything which is a different type
elseif($old_table_def['fd'][$name]['type'] != $data['type'] && ($type_translated = $this->TranslateType($data['type']))) elseif($old_table_def['fd'][$name]['type'] != $data['type'] && ($type_translated = $this->TranslateType($data['type'])))
{ {