Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/cte
Browse files Browse the repository at this point in the history
  • Loading branch information
@ilestis
ilestis authored Dec 2, 2023
2 parents 6340a9f + eae5ffd commit aee6811
Show file tree
Hide file tree
Showing 18 changed files with 2 additions and 3,017 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ yarn-error.log
.phpunit.result.cache
*.sql
package-lock.json
.phpstorm.meta.php

2,931 changes: 0 additions & 2,931 deletions .phpstorm.meta.php
View file

This file was deleted.

1 change: 0 additions & 1 deletion app/Console/Commands/InstallCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public function handle()
return;
}
} catch (Exception) {

}
$this->call('key:generate');
$this->call('migrate');
Expand Down
1 change: 1 addition & 0 deletions app/Services/RecoveryService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ protected function trashChild(Entity $entity, MiscModel $child = null)

// Clean up the parent and tree to avoid the nested plugin to delete every child
$child->$parentField = null;

$child->timestamps = false;
$child->saveQuietly();
$child->refresh();
Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2017_10_27_091755_create_families.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ public function up()
$table->integer('campaign_id')->unsigned()->notNull();

$table->integer('family_id')->unsigned()->nullable();
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);

$table->string('type', 45)->nullable();
$table->longText('entry')->nullable();
Expand All @@ -34,8 +32,6 @@ public function up()
$table->boolean('is_private')->default(false);
$table->index(['is_private']);

$table->index(['_lft', '_rgt', 'family_id']);

// Foreign
$table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
$table->foreign('family_id')->references('id')->on('families')->onDelete('set null');
Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2017_10_27_102246_create_locations.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,9 @@ public function up()

$table->boolean('is_map_private')->default(0);

$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);

// Index
$table->index(['name', 'slug', 'type']);
$table->index(['is_private']);
$table->index(['_lft', '_rgt', 'parent_location_id']);

// Foreign
$table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2017_10_30_160256_create_journal_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ public function up()
$table->unsignedInteger('author_id')->nullable();
$table->unsignedInteger('location_id')->nullable();

$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);
$table->index(['_lft', '_rgt']);

// Overview
$table->longText('entry')->nullable();

Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2017_11_01_222903_create_organisation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ public function up()

$table->longText('entry')->nullable();

$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);

$table->boolean('is_private')->default(false);
$table->boolean('is_defunct')->default(0);
$table->timestamps();
Expand All @@ -43,7 +40,6 @@ public function up()

// Index
$table->index(['name', 'slug', 'type']);
$table->index(['_lft', '_rgt', 'organisation_id']);
});

Schema::create('organisation_member', function (Blueprint $table) {
Expand Down
3 changes: 0 additions & 3 deletions database/migrations/2017_11_03_181958_create_notes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ public function up()

$table->integer('campaign_id')->unsigned()->notNull();
$table->unsignedInteger('note_id')->nullable();
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);


// Overview
Expand All @@ -41,7 +39,6 @@ public function up()

// Index
$table->index(['name', 'slug', 'type']);
$table->index(['_lft', '_rgt', 'note_id']);
});
}

Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2017_11_16_145219_create_events.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ public function up()
$table->unsignedInteger('event_id')->nullable();

$table->longText('entry')->nullable();

$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);
$table->timestamps();

// Foreign
Expand All @@ -38,7 +35,6 @@ public function up()

// Index
$table->index(['name', 'slug', 'type', 'date', 'is_private']);
$table->index(['_lft', '_rgt']);
});
}

Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2018_02_14_102646_create_attribute_template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public function up()
$table->string('name')->notNull();
$table->boolean('is_private')->default(false)->notNull();

$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);

$table->timestamps();

// Foreign
Expand All @@ -34,7 +31,6 @@ public function up()

// Indexes
$table->index(['name', 'is_private']);
$table->index(['_lft', '_rgt', 'attribute_template_id']);
});
}

Expand Down
3 changes: 0 additions & 3 deletions database/migrations/2018_04_24_193803_create_sections_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,12 @@ public function up()
$table->string('colour', 20)->nullable();

$table->unsignedInteger('tag_id')->nullable();
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);
$table->boolean('is_hidden')->default(false);
$table->boolean('is_auto_applied')->default(0);

$table->timestamps();

$table->index(['name', 'type', 'is_private', 'is_hidden', 'is_auto_applied']);
$table->index(['tag_id', '_lft', '_rgt']);

// Foreign
$table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
Expand Down
3 changes: 0 additions & 3 deletions database/migrations/2018_09_25_134530_create_race.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ public function up()
$table->unsignedInteger('campaign_id');
$table->string('name', 191);
$table->unsignedInteger('race_id')->nullable();
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);
$table->string('image', 255)->nullable();
$table->string('type', 45)->nullable();
$table->string('slug')->nullable();
Expand All @@ -33,7 +31,6 @@ public function up()
$table->unsignedInteger('updated_by')->nullable();

$table->index(['name', 'type', 'is_private']);
$table->index(['_lft', '_rgt', 'race_id']);

$table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
$table->foreign('created_by')->references('id')->on('users')->onDelete('set null');
Expand Down
5 changes: 0 additions & 5 deletions database/migrations/2020_03_05_174449_create_abilities_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ public function up()
$table->unsignedInteger('ability_id')->nullable();
$table->boolean('is_private')->default(false);

// Tree
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);
$table->index(['_lft', '_rgt', 'ability_id']);

// Overview
$table->longText('entry')->nullable();
$table->string('charges', 120)->nullable();
Expand Down
5 changes: 0 additions & 5 deletions database/migrations/2020_06_06_084917_create_maps_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ public function up()
$table->boolean('is_private')->default(false);
$table->boolean('is_real')->default(false);

// Tree
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);
$table->index(['_lft', '_rgt', 'map_id']);

// Overview
$table->longText('entry')->nullable();

Expand Down
3 changes: 0 additions & 3 deletions database/migrations/2020_08_03_155441_create_timelines_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public function up()
$table->longText('entry')->nullable();

$table->boolean('revert_order')->default(false);
$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);

$table->timestamps();
$table->softDeletes();
Expand All @@ -45,7 +43,6 @@ public function up()

// Index
$table->index(['name', 'slug', 'type']);
$table->index(['_lft', '_rgt']);
});

Schema::create('timeline_eras', function (Blueprint $table) {
Expand Down
4 changes: 0 additions & 4 deletions database/migrations/2022_10_20_192238_create_creatures_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ public function up()
$table->unsignedInteger('created_by')->nullable();
$table->unsignedInteger('updated_by')->nullable();

$table->unsignedInteger('_lft')->default(0);
$table->unsignedInteger('_rgt')->default(0);

$table->index(['name', 'type', 'is_private']);
$table->index(['_lft', '_rgt']);

$table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
$table->foreign('created_by')->references('id')->on('users')->onDelete('set null');
Expand Down
35 changes: 0 additions & 35 deletions database/migrations/2023_03_28_182318_update_quests_add_nesting.php
View file

This file was deleted.

0 comments on commit aee6811

Please sign in to comment.