Skip to content

Commit e1710ea

Browse files
asmecherasmecher
committed
1 parent a740734 commit e1710ea

File tree

6 files changed

+52
-42
lines changed

6 files changed

+52
-42
lines changed

‎classes/migration/OMPMigration.inc.php ‎classes/migration/install/OMPMigration.inc.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* @file classes/migration/OMPMigration.inc.php
4+
* @file classes/migration/install/OMPMigration.inc.php
55
*
66
* Copyright (c) 2014-2021 Simon Fraser University
77
* Copyright (c) 2000-2021 John Willinsky
@@ -11,16 +11,17 @@
1111
* @brief Describe database table structures.
1212
*/
1313

14-
use Illuminate\Database\Migrations\Migration;
14+
namespace APP\migration\install;
15+
1516
use Illuminate\Database\Schema\Blueprint;
1617
use Illuminate\Support\Facades\Schema;
1718

18-
class OMPMigration extends Migration
19+
class OMPMigration extends \PKP\migration\Migration
1920
{
2021
/**
2122
* Run the migrations.
2223
*/
23-
public function up()
24+
public function up(): void
2425
{
2526
Schema::create('identification_codes', function (Blueprint $table) {
2627
$table->bigInteger('identification_code_id')->autoIncrement();
@@ -297,7 +298,7 @@ public function up()
297298
/**
298299
* Reverse the migration.
299300
*/
300-
public function down()
301+
public function down(): void
301302
{
302303
Schema::drop('completed_payments');
303304
Schema::drop('identification_codes');

‎classes/migration/upgrade/OMPv3_3_0UpgradeMigration.inc.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
* @brief Describe database table structures.
1212
*/
1313

14+
namespace APP\migration\upgrade;
15+
1416
use APP\core\Application;
15-
use Illuminate\Database\Migrations\Migration;
1617
use Illuminate\Database\Schema\Blueprint;
1718
use Illuminate\Support\Facades\App;
1819
use Illuminate\Support\Facades\DB;
@@ -21,7 +22,7 @@
2122
use PKP\services\PKPSchemaService;
2223
use PKP\submission\SubmissionFile;
2324

24-
class OMPv3_3_0UpgradeMigration extends Migration
25+
class OMPv3_3_0UpgradeMigration extends \PKP\migration\Migration
2526
{
2627
/**
2728
* Run the migrations.

‎classes/migration/upgrade/v3_4_0/I6807_SetLastModified.inc.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313

1414
namespace APP\migration\upgrade\v3_4_0;
1515

16-
use Illuminate\Database\Migrations\Migration;
1716
use Illuminate\Support\Facades\DB;
1817

19-
class I6807_SetLastModified extends Migration
18+
class I6807_SetLastModified extends \PKP\migration\Migration
2019
{
2120
/**
2221
* Run the migration.
@@ -35,7 +34,3 @@ public function down()
3534
// We don't have the data to downgrade and downgrades are unwanted here anyway.
3635
}
3736
}
38-
39-
if (!PKP_STRICT_MODE) {
40-
class_alias('\APP\migration\upgrade\v3_4_0\I6807_SetLastModified', '\I6807_SetLastModified');
41-
}

‎dbscripts/xml/install.xml

+24-23
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,32 @@
1616
<code function="createDirectories" />
1717

1818
<!-- PKP schema components -->
19-
<migration class="lib.pkp.classes.migration.AnnouncementsMigration" />
20-
<migration class="lib.pkp.classes.migration.CategoriesMigration" />
21-
<migration class="lib.pkp.classes.migration.CommonMigration" />
22-
<migration class="lib.pkp.classes.migration.ControlledVocabMigration" />
23-
<migration class="lib.pkp.classes.migration.FilesMigration" />
24-
<migration class="lib.pkp.classes.migration.GenresMigration" />
25-
<migration class="lib.pkp.classes.migration.JobsMigration" />
26-
<migration class="lib.pkp.classes.migration.LibraryFilesMigration" />
27-
<migration class="lib.pkp.classes.migration.LogMigration" />
28-
<migration class="lib.pkp.classes.migration.MetadataMigration" />
29-
<migration class="lib.pkp.classes.migration.MetricsMigration" />
30-
<migration class="lib.pkp.classes.migration.NavigationMenusMigration" />
31-
<migration class="lib.pkp.classes.migration.NotesMigration" />
32-
<migration class="lib.pkp.classes.migration.ReviewFormsMigration" />
33-
<migration class="lib.pkp.classes.migration.SubmissionFilesMigration" /><!-- before ReviewsMigration so that foreign keys can be defined-->
34-
<migration class="lib.pkp.classes.migration.RolesAndUserGroupsMigration" />
35-
<migration class="lib.pkp.classes.migration.ScheduledTasksMigration" />
36-
<migration class="lib.pkp.classes.migration.SubmissionsMigration" />
37-
<migration class="lib.pkp.classes.migration.ReviewsMigration" />
38-
<migration class="lib.pkp.classes.migration.TemporaryFilesMigration" />
39-
<migration class="lib.pkp.classes.migration.TombstoneMigration" />
40-
<migration class="lib.pkp.classes.migration.ViewsMigration" />
19+
<migration class="PKP\migration\install\CategoriesMigration" />
20+
<migration class="PKP\migration\install\CommonMigration" />
21+
<migration class="PKP\migration\install\ControlledVocabMigration" />
22+
<migration class="PKP\migration\install\FilesMigration" />
23+
<migration class="PKP\migration\install\GenresMigration" />
24+
<migration class="PKP\migration\install\JobsMigration" />
25+
<migration class="PKP\migration\install\LibraryFilesMigration" />
26+
<migration class="PKP\migration\install\LogMigration" />
27+
<migration class="PKP\migration\install\MetadataMigration" />
28+
<migration class="PKP\migration\install\MetricsMigration" />
29+
<migration class="PKP\migration\install\NavigationMenusMigration" />
30+
<migration class="PKP\migration\install\NotesMigration" />
31+
<migration class="PKP\migration\install\ReviewFormsMigration" />
32+
<migration class="PKP\migration\install\SubmissionFilesMigration" />
33+
<migration class="PKP\migration\install\RolesAndUserGroupsMigration" />
34+
<migration class="PKP\migration\install\ScheduledTasksMigration" />
35+
<migration class="PKP\migration\install\SubmissionsMigration" />
36+
<migration class="PKP\migration\install\ReviewsMigration" />
37+
<migration class="PKP\migration\install\TemporaryFilesMigration" />
38+
<migration class="PKP\migration\install\TombstoneMigration" />
39+
<migration class="PKP\migration\install\ViewsMigration" />
4140

4241
<!-- OMP schema -->
43-
<migration class="classes.migration.OMPMigration" />
42+
<migration class="APP\migration\install\OMPMigration" />
43+
44+
<migration class="PKP\migration\install\AnnouncementsMigration" />
4445

4546
<code function="createData" />
4647
<code function="createConfig" />

‎dbscripts/xml/upgrade.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,22 @@
157157
<upgrade minversion="2.4.0.0" maxversion="3.2.0.9">
158158
<data file="dbscripts/xml/upgrade/3.2.1_update.xml" />
159159
<code function="installEmailTemplate" key="ANNOUNCEMENT" locales="ca_ES,da_DK,en_US,es_ES,pt_BR" />
160-
<migration class="lib.pkp.classes.migration.upgrade.PKPv3_2_1SubeditorCategoriesMigration" />
160+
<migration class="PKP\migration\upgrade\PKPv3_2_1SubeditorCategoriesMigration" />
161161
<note file="docs/release-notes/README-3.2.1" />
162162
</upgrade>
163163

164164
<upgrade minversion="3.0.0.0" maxversion="3.2.9.9">
165-
<migration class="lib.pkp.classes.migration.upgrade.PKPv3_3_0UpgradeMigration" />
166-
<migration class="classes.migration.upgrade.OMPv3_3_0UpgradeMigration" />
165+
<migration class="PKP\migration\upgrade\PKPv3_3_0UpgradeMigration" />
166+
<migration class="APP\migration\upgrade\OMPv3_3_0UpgradeMigration" />
167167
<note file="docs/release-notes/README-3.3.0" />
168168
</upgrade>
169169

170170
<upgrade minversion="3.0.0.0" maxversion="3.3.9.9">
171-
<migration class="lib.pkp.classes.migration.upgrade.PKPv3_4_0UpgradeMigration" />
172-
<migration class="lib.pkp.classes.migration.upgrade.v3_4_0.I4904_UsageStatsTemporaryRecords" />
173-
<migration class="classes.migration.upgrade.v3_4_0.I6807_SetLastModified" />
171+
<migration class="PKP\migration\upgrade\v3_4_0\PreflightCheckMigration" fallback="3.3.9.9" />
172+
<migration class="PKP\migration\upgrade\v3_4_0\I6093_AddForeignKeys" />
173+
<migration class="PKP\migration\upgrade\v3_4_0\UpgradeMigration" />
174+
<migration class="PKP\migration\upgrade\v3_4_0\I4904_UsageStatsTemporaryRecords" />
175+
<migration class="APP\migration\upgrade\v3_4_0\I6807_SetLastModified" />
174176
<data file="dbscripts/xml/upgrade/3.4.0_preupdate_email_templates.xml" />
175177
<note file="docs/release-notes/README-3.4.0" />
176178
</upgrade>

‎schemaspy.properties

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# SchemaSpy (http://www.schemaspy.org) can be used to visualize the database.
2+
# Run it as follows:
3+
# java -jar /path/to/schemaspy.jar \
4+
# -t mariadb \
5+
# -dp /path/to/mariadb-java-client.jar \
6+
# -u db_username -p db_password -host db_hostname -db db_name -s db_name
7+
8+
schemaspy.o=docs/schemaspy
9+
schemaspy.norows=true
10+
schemaspy.noviews=true

0 commit comments

Comments
 (0)