diff --git a/database/migrations/2017_06_10_111513_create_benutzers_table.php b/database/migrations/2017_06_10_111513_create_benutzers_table.php index 731e499c..46684649 100644 --- a/database/migrations/2017_06_10_111513_create_benutzers_table.php +++ b/database/migrations/2017_06_10_111513_create_benutzers_table.php @@ -13,7 +13,7 @@ class CreateBenutzersTable extends Migration */ public function up() { - Schema::rename("users", "benutzer"); + //Schema::rename("users", "benutzer"); } /** @@ -23,6 +23,6 @@ class CreateBenutzersTable extends Migration */ public function down() { - Schema::rename('benutzer',"users"); + //Schema::rename('benutzer',"users"); } } diff --git a/database/migrations/2017_06_10_112943_create_eintragungs_table.php b/database/migrations/2017_06_10_112943_create_eintragungs_table.php index ad9bb0c0..27444273 100644 --- a/database/migrations/2017_06_10_112943_create_eintragungs_table.php +++ b/database/migrations/2017_06_10_112943_create_eintragungs_table.php @@ -17,8 +17,8 @@ class CreateEintragungsTable extends Migration $table->increments('id'); $table->timestamps(); - $table->integer('benutzer_id')->unsigned(); - $table->foreign('benutzer_id')->references('id')->on('benutzer'); + $table->integer('user_id')->unsigned(); + $table->foreign('user_id')->references('id')->on('users'); $table->integer('veranstaltung_id')->unsigned(); $table->foreign('veranstaltung_id')->references('id')->on('veranstaltungen'); diff --git a/database/migrations/2017_06_10_113808_create_einteilungs_table.php b/database/migrations/2017_06_10_113808_create_einteilungs_table.php index 1c26636e..1656cb13 100644 --- a/database/migrations/2017_06_10_113808_create_einteilungs_table.php +++ b/database/migrations/2017_06_10_113808_create_einteilungs_table.php @@ -20,8 +20,8 @@ class CreateEinteilungsTable extends Migration $table->dateTime('start'); $table->dateTime('ende')->nullable(); - $table->integer('benutzer_id')->unsigned(); - $table->foreign('benutzer_id')->references('id')->on('benutzer'); + $table->integer('user_id')->unsigned(); + $table->foreign('user_id')->references('id')->on('users'); $table->integer('veranstaltung_id')->unsigned(); $table->foreign('veranstaltung_id')->references('id')->on('veranstaltungen'); diff --git a/database/migrations/2017_06_10_121932_update_benutzer_table.php b/database/migrations/2017_06_10_121932_update_benutzer_table.php index b0b2dbbb..96daac5a 100644 --- a/database/migrations/2017_06_10_121932_update_benutzer_table.php +++ b/database/migrations/2017_06_10_121932_update_benutzer_table.php @@ -13,7 +13,7 @@ class UpdateBenutzerTable extends Migration */ public function up() { - Schema::table('benutzer', function (Blueprint $table){ + Schema::table('users', function (Blueprint $table){ $table->string('anzeigename',20)->unique(); $table->string('telefon',20); }); @@ -26,7 +26,7 @@ class UpdateBenutzerTable extends Migration */ public function down() { - Schema::table('benutzer', function (Blueprint $table){ + Schema::table('users', function (Blueprint $table){ $table->dropColumn(['anzeigename','telefon']); }); } diff --git a/database/migrations/2017_06_10_122448_create_arbeitszeits_table.php b/database/migrations/2017_06_10_122448_create_arbeitszeits_table.php index 2ccc5fef..33ffcf51 100644 --- a/database/migrations/2017_06_10_122448_create_arbeitszeits_table.php +++ b/database/migrations/2017_06_10_122448_create_arbeitszeits_table.php @@ -20,8 +20,8 @@ class CreateArbeitszeitsTable extends Migration $table->dateTime("beginn"); $table->datetime("ende"); - $table->integer('benutzer_id')->unsigned(); - $table->foreign('benutzer_id')->references('id')->on('benutzer')->onDelete('cascade'); + $table->integer('user_id')->unsigned(); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); }); } diff --git a/database/migrations/2017_06_10_134148_veranstaltung_table_add_ende.php b/database/migrations/2017_06_10_134148_veranstaltung_table_add_ende.php deleted file mode 100644 index 211e6144..00000000 --- a/database/migrations/2017_06_10_134148_veranstaltung_table_add_ende.php +++ /dev/null @@ -1,26 +0,0 @@ -