From 26cbd7b3e17e6d575ca65bfcb1253aef6e89c330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc?= <tardieuloc@yahoo.fr>
Date: Wed, 11 Mar 2020 10:20:12 +0100
Subject: [PATCH] =?UTF-8?q?Validation=20des=203=20premi=C3=A8res=20requett?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tp2/src/controllers/ControleurRequete.php | 24 +++++++++++------------
 tp2/src/models/Character.php              | 14 -------------
 tp2/src/models/Game_publisher.php         | 14 -------------
 tp2/src/models/Game_publishers.php        | 14 +++++++++++++
 tp2/src/models/Perso.php                  | 14 +++++++++++++
 5 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 tp2/src/models/Character.php
 delete mode 100644 tp2/src/models/Game_publisher.php
 create mode 100644 tp2/src/models/Game_publishers.php
 create mode 100644 tp2/src/models/Perso.php

diff --git a/tp2/src/controllers/ControleurRequete.php b/tp2/src/controllers/ControleurRequete.php
index e1ece9d..491991a 100644
--- a/tp2/src/controllers/ControleurRequete.php
+++ b/tp2/src/controllers/ControleurRequete.php
@@ -5,9 +5,9 @@ namespace bdd\controllers;
 use bdd\models\Company;
 use bdd\models\Game;
 use bdd\models\Platform;
-use bdd\models\Character;
+use bdd\models\Perso;
 use bdd\models\Game2character;
-use bdd\models\Game_publisher;
+use bdd\models\Game_publishers;
 use bdd\views\RequeteView;
 
 class ControleurRequete{
@@ -45,29 +45,29 @@ class ControleurRequete{
     }
 
     public function selectChar(){
-        $data = Character::join('game2character','character.id','=','game2character.character_id')
-                            ->select('id','deck')
-                            ->where('game2character.game_id','=','12342');
+        $data = Perso::select('id','deck')
+							->join('game2character','perso.id','=','game2character.character_id')
+                            ->where('game2character.game_id','=','12342')->get();
     
         $vue = new RequeteView($data);
         $vue->render(1);
     }
 
     public function selectCharMario(){
-        $data = Character::join('game2character','character.id','=','game2character.character_id')
+        $data = Perso::join('game2character','perso.id','=','game2character.character_id')
                             ->join('game','game2character.game_id','=','game.id')
-                            ->select('id')
-                            ->where('game.name','LIKE','Mario%');
+                            ->select('perso.id')
+                            ->where('game.name','LIKE','Mario%')->get();
        
         $vue = new RequeteView($data);
         $vue->render(1);
     }
 
     public function gameCompanySony(){
-        $data = Game::join('game_publisher','game.id','=','game_publisher.game_id')
-                            ->join('company','game_publisher.comp_id','=','company.id')
-                            ->select('id')
-                            ->where('company.name','LIKE','%Sony%');
+        $data = Game::join('game_publishers','game.id','=','game_publishers.game_id')
+                            ->join('company','game_publishers.comp_id','=','company.id')
+                            ->select('game.id','game.name')
+                            ->where('company.name','LIKE','%Sony%')->get();
        
         $vue = new RequeteView($data);
         $vue->render(1);
diff --git a/tp2/src/models/Character.php b/tp2/src/models/Character.php
deleted file mode 100644
index 7168e6e..0000000
--- a/tp2/src/models/Character.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace bdd\models;
-
-class Character extends \Illuminate\Database\Eloquent\Model
-{
-    protected $table = 'character';
-    protected $primaryKey = 'id';
-    public $timestamps = false;
-
-    public function platform(){
-       return $this->belongsTo('bdd\models\character', 'id');
-    }
-}
\ No newline at end of file
diff --git a/tp2/src/models/Game_publisher.php b/tp2/src/models/Game_publisher.php
deleted file mode 100644
index 51302c2..0000000
--- a/tp2/src/models/Game_publisher.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace bdd\models;
-
-class Game_publisher extends \Illuminate\Database\Eloquent\Model
-{
-    protected $table = 'game_publisher';
-    protected $primaryKey = 'game_id';
-    public $timestamps = false;
-
-    public function platform(){
-       return $this->belongsTo('bdd\models\game_publisher', 'game_id');
-    }
-}
\ No newline at end of file
diff --git a/tp2/src/models/Game_publishers.php b/tp2/src/models/Game_publishers.php
new file mode 100644
index 0000000..9f0dede
--- /dev/null
+++ b/tp2/src/models/Game_publishers.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace bdd\models;
+
+class Game_publishers extends \Illuminate\Database\Eloquent\Model
+{
+    protected $table = 'game_publishers';
+    protected $primaryKey = 'game_id';
+    public $timestamps = false;
+
+    public function platform(){
+       return $this->belongsTo('bdd\models\game_publishers', 'game_id');
+    }
+}
\ No newline at end of file
diff --git a/tp2/src/models/Perso.php b/tp2/src/models/Perso.php
new file mode 100644
index 0000000..5476170
--- /dev/null
+++ b/tp2/src/models/Perso.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace bdd\models;
+
+class Perso extends \Illuminate\Database\Eloquent\Model
+{
+    protected $table = 'perso';
+    protected $primaryKey = 'id';
+    public $timestamps = false;
+
+    public function platform(){
+       return $this->belongsTo('bdd\models\perso', 'id');
+    }
+}
\ No newline at end of file
-- 
GitLab