This commit is contained in:
Kilian Hofmann 2021-08-13 21:08:59 +02:00
parent 837d86ae21
commit 77799b26cc
8 changed files with 53 additions and 60 deletions

View File

@ -56,11 +56,11 @@ class ExamMemberRank extends Model
* @return void * @return void
*/ */
protected static function boot() protected static function boot()
{ {
parent::boot(); parent::boot();
static::addGlobalScope('exam_member_rank_member_rank_id', function ($builder) { static::addGlobalScope('exam_member_rank_member_rank_id', function ($builder) {
$builder->where('member_rank_id', '<>', null); $builder->where('member_rank_id', '<>', null);
}); });
} }
} }

View File

@ -43,7 +43,7 @@ class ExamMemberRankAnswer extends Model
], ],
]; ];
/** /**
* The "booting" method of the model. * The "booting" method of the model.
* *
* @return void * @return void

View File

@ -32,10 +32,7 @@ class ExamMemberRankQuestion extends Model
]; ];
public $hasMany = [ public $hasMany = [
'exam_answers' => [ 'exam_answers' => ['GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer', 'key' => 'exam_question_id'],
'GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer',
'key' => 'exam_question_id',
],
]; ];
public $belongsTo = [ public $belongsTo = [

View File

@ -36,7 +36,7 @@ class ExamTyperating extends Model
]; ];
public $belongsToMany = [ public $belongsToMany = [
'exam_questions' => [ 'exam_questions' => [
'GermanAirlinesVa\Schooling\Models\ExamTyperatingQuestion', 'GermanAirlinesVa\Schooling\Models\ExamTyperatingQuestion',
'table' => 'exam_exam_answer_exam_question', 'table' => 'exam_exam_answer_exam_question',
'key' => 'exam_id', 'key' => 'exam_id',

View File

@ -32,10 +32,7 @@ class ExamTyperatingQuestion extends Model
]; ];
public $hasMany = [ public $hasMany = [
'exam_answers' => [ 'exam_answers' => ['GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer', 'key' => 'exam_question_id'],
'GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer',
'key' => 'exam_question_id',
],
]; ];
public $belongsTo = [ public $belongsTo = [
@ -51,7 +48,7 @@ class ExamTyperatingQuestion extends Model
], ],
]; ];
/** /**
* The "booting" method of the model. * The "booting" method of the model.
* *
* @return void * @return void

View File

@ -5,34 +5,33 @@ use October\Rain\Database\Updates\Migration;
class BuilderTableCreateExamExamAnswerExamQuestion extends Migration class BuilderTableCreateExamExamAnswerExamQuestion extends Migration
{ {
public function up() public function up()
{ {
Schema::connection('germanairlinesva_schooling')->create('exam_exam_answer_exam_question', function($table) Schema::connection('germanairlinesva_schooling')->create('exam_exam_answer_exam_question', function ($table) {
{ $table->engine = 'InnoDB';
$table->engine = 'InnoDB'; $table->bigIncrements('id')->unsigned();
$table->bigIncrements('id')->unsigned(); $table->bigInteger('exam_id')->unsigned();
$table->bigInteger('exam_id')->unsigned(); $table
$table ->foreign('exam_id')
->foreign('exam_id') ->references('id')
->references('id') ->on('exams');
->on('exams'); $table->bigInteger('exam_answer_id')->unsigned();
$table->bigInteger('exam_answer_id')->unsigned(); $table
$table ->foreign('exam_answer_id')
->foreign('exam_answer_id') ->references('id')
->references('id') ->on('exam_answers');
->on('exam_answers'); $table->bigInteger('exam_question_id')->unsigned();
$table->bigInteger('exam_question_id')->unsigned(); $table
$table ->foreign('exam_question_id')
->foreign('exam_question_id') ->references('id')
->references('id') ->on('exam_questions');
->on('exam_questions'); });
}); }
}
public function down()
public function down() {
{ Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints(); Schema::dropIfExists('germanairlinesva_schooling_exam_exam_answer_exam_question');
Schema::dropIfExists('germanairlinesva_schooling_exam_exam_answer_exam_question'); Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints(); }
}
} }

View File

@ -1,17 +1,17 @@
1.0.1: 1.0.1:
- 'Initialize plugin.' - 'Initialize plugin.'
- 'Create table deferred_bindings' - 'Create table deferred_bindings'
- builder_table_create_deferred_bindings.php - builder_table_create_deferred_bindings.php
1.0.2: 1.0.2:
- 'Created table typeratings' - 'Created table typeratings'
- builder_table_create_typeratings.php - builder_table_create_typeratings.php
- 'Created table member_ranks' - 'Created table member_ranks'
- builder_table_create_member_ranks.php - builder_table_create_member_ranks.php
- 'Created table exam_questions' - 'Created table exam_questions'
- builder_table_create_exam_questions.php - builder_table_create_exam_questions.php
- 'Created table exam_answers' - 'Created table exam_answers'
- builder_table_create_exam_answers.php - builder_table_create_exam_answers.php
- 'Created table exams' - 'Created table exams'
- builder_table_create_exams.php - builder_table_create_exams.php
- 'Created table exam_exam_answer_exam_question' - 'Created table exam_exam_answer_exam_question'
- builder_table_create_exam_exam_answer_exam_question.php - builder_table_create_exam_exam_answer_exam_question.php

View File

@ -41,9 +41,9 @@ p-defer@^1.0.0:
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
"php-parser@git+https://github.com/glayzzle/php-parser.git#e61e26102144f267ecf5e09020865a9baa6ca2f1": "php-parser@https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1":
version "3.0.2" version "3.0.2"
resolved "git+https://github.com/glayzzle/php-parser.git#e61e26102144f267ecf5e09020865a9baa6ca2f1" resolved "https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1"
prettier@^2.3.2: prettier@^2.3.2:
version "2.3.2" version "2.3.2"