tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-27 15:09:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6933 from robbieaverill/pulls/4.0/table-name-on-dev-build

Browse Source 
Change to show created table names instead of model names in dev/build
This commit is contained in:
Damian Mooyman 2017-05-20 23:10:19 +12:00 committed by GitHub
commit f35017479b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ORM/DatabaseAdmin.php
View File

@ -260,6 +260,9 @@ class DatabaseAdmin extends Controller
// Initiate schema update // Initiate schema update
$dbSchema = DB::get_schema(); $dbSchema = DB::get_schema();
$dbSchema->schemaUpdate(function () use ($dataClasses, $testMode, $quiet) { $dbSchema->schemaUpdate(function () use ($dataClasses, $testMode, $quiet) {
/** @var SilverStripe\ORM\DataObjectSchema $dataObjectSchema */
$dataObjectSchema = DataObject::getSchema();
foreach ($dataClasses as $dataClass) { foreach ($dataClasses as $dataClass) {
// Check if class exists before trying to instantiate - this sidesteps any manifest weirdness // Check if class exists before trying to instantiate - this sidesteps any manifest weirdness
if (!class_exists($dataClass)) { if (!class_exists($dataClass)) {
@ -271,13 +274,14 @@ class DatabaseAdmin extends Controller
if (!$testMode && $SNG instanceof TestOnly) { if (!$testMode && $SNG instanceof TestOnly) {
continue; continue;
} }
$tableName = $dataObjectSchema->tableName($dataClass);
// Log data // Log data
if (!$quiet) { if (!$quiet) {
if (Director::is_cli()) { if (Director::is_cli()) {
echo " * $dataClass\n"; echo " * $tableName\n";
} else { } else {
echo "<li>$dataClass</li>\n"; echo "<li>$tableName</li>\n";
} }
} }