L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52511-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-02-16 02:00:56 +01:00
parent 56044641b0 e2f8826fa8
commit ad1485c866
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dml/pgsql_native_moodle_database.php
+24 -3
View File
@@ -478,7 +478,14 @@ class pgsql_native_moodle_database extends moodle_database {
$info->scale = null;
$info->not_null = ($rawcolumn->attnotnull === 't');
if ($info->has_default) {
$info->default_value = trim($rawcolumn->adsrc, '()');
// PG 9.5+ uses ::<TYPE> syntax for some defaults.
$parts = explode('::', $rawcolumn->adsrc);
if (count($parts) > 1) {
$info->default_value = reset($parts);
} else {
$info->default_value = $rawcolumn->adsrc;
}
$info->default_value = trim($info->default_value, "()'");
} else {
$info->default_value = null;
}
@@ -496,7 +503,14 @@ class pgsql_native_moodle_database extends moodle_database {
$info->not_null = ($rawcolumn->attnotnull === 't');
$info->has_default = ($rawcolumn->atthasdef === 't');
if ($info->has_default) {
$info->default_value = trim($rawcolumn->adsrc, '()');
// PG 9.5+ uses ::<TYPE> syntax for some defaults.
$parts = explode('::', $rawcolumn->adsrc);
if (count($parts) > 1) {
$info->default_value = reset($parts);
} else {
$info->default_value = $rawcolumn->adsrc;
}
$info->default_value = trim($info->default_value, "()'");
} else {
$info->default_value = null;
}
@@ -514,7 +528,14 @@ class pgsql_native_moodle_database extends moodle_database {
$info->not_null = ($rawcolumn->attnotnull === 't');
$info->has_default = ($rawcolumn->atthasdef === 't');
if ($info->has_default) {
$info->default_value = trim($rawcolumn->adsrc, '()');
// PG 9.5+ uses ::<TYPE> syntax for some defaults.
$parts = explode('::', $rawcolumn->adsrc);
if (count($parts) > 1) {
$info->default_value = reset($parts);
} else {
$info->default_value = $rawcolumn->adsrc;
}
$info->default_value = trim($info->default_value, "()'");
} else {
$info->default_value = null;
}