diff --git a/index.js b/index.js index 421ed81..4382532 100644 --- a/index.js +++ b/index.js @@ -137,7 +137,7 @@ function executeSocket(variables={},needsData=true,errMess='',data={},FUN=functi } const query = { - text: 'SELECT id_page,noeud_courant,id_jeu_depart FROM platooschem.page WHERE nom_page = $1;', + text: 'SELECT id_page,noeud_courant,id_jeu_depart FROM page WHERE nom_page = $1;', values: [this.nomPlatoo], } @@ -270,7 +270,7 @@ app } })*/ - connection.query('SELECT nom_jeu FROM platooschem.jeu ORDER BY nom_jeu;',function(err,results){ + connection.query('SELECT nom_jeu FROM jeu ORDER BY nom_jeu;',function(err,results){ if(err){ console.log('erreur de connexion : '+err.stack); var parametresAccueil = { @@ -314,10 +314,10 @@ app var jeu_ok = true; var page_dontexist = true; if(valide_hasard){ - var query ='SELECT nom_page FROM platooschem.page;'; + var query ='SELECT nom_page FROM page;'; }else{ var query = { - text:'SELECT nom_page FROM platooschem.page WHERE nom_page = $1;', + text:'SELECT nom_page FROM page WHERE nom_page = $1;', values:[req.body.url] }; } @@ -351,7 +351,7 @@ app function(jeu_ok,page_dontexist,callback){ if(page_dontexist && valide_jeu){ const query = { - text:'SELECT nom_jeu FROM platooschem.jeu WHERE nom_jeu = $1;', + text:'SELECT nom_jeu FROM jeu WHERE nom_jeu = $1;', values:[req.body.jeu] }; connection.query(query,function(err,results){ @@ -382,7 +382,7 @@ app function(callback2){ var id_page=0; var id_jeu=0; - connection.query('SELECT MAX(id_page)+1 AS id FROM platooschem.page;',function(err,results){ + connection.query('SELECT MAX(id_page)+1 AS id FROM page;',function(err,results){ if(err){ //console.log('ERROR :'+err.stack);//ATT //err.message=err.stack @@ -400,7 +400,7 @@ app function(id_page,id_jeu,callback2){ const query = { - text:'SELECT id_jeu AS id FROM platooschem.jeu WHERE nom_jeu = $1;', + text:'SELECT id_jeu AS id FROM jeu WHERE nom_jeu = $1;', values:[req.body.jeu] }; connection.query(query,function(err,results){ @@ -446,7 +446,7 @@ app async.waterfall([ function(callback3){ const query={ - text:'INSERT INTO platooschem.page (id_page,nom_page,id_jeu_depart,nombre_trashs,creating_date,noeud_courant) SELECT $1,$2,id_jeu,nombre_trashs,CURRENT_TIMESTAMP,1 FROM platooschem.jeu WHERE id_jeu = $3; ', + text:'INSERT INTO page (id_page,nom_page,id_jeu_depart,nombre_trashs,creating_date,noeud_courant) SELECT $1,$2,id_jeu,nombre_trashs,CURRENT_TIMESTAMP,1 FROM jeu WHERE id_jeu = $3; ', values:[id_page,req.body.url,id_jeu] }; client.query(query,function(err,results){ @@ -462,14 +462,14 @@ app }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.joueur_on_page (id_page,id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac) SELECT $1,'+'id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac FROM platooschem.joueur_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO joueur_on_page (id_page,id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac) SELECT $1,'+'id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac FROM joueur_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.save_on_page (id_page,noeud_precedent,noeud_suivant,date,type_action,auteur,couleur,id_joueur) SELECT $1,0,1,CURRENT_TIMESTAMP,\'create\',NULL,NULL,1;', + text:'INSERT INTO save_on_page (id_page,noeud_precedent,noeud_suivant,date,type_action,auteur,couleur,id_joueur) SELECT $1,0,1,CURRENT_TIMESTAMP,\'create\',NULL,NULL,1;', values:[data.id_page] }; queryChainedClient(client,query,callback3,data,resTot); @@ -478,84 +478,84 @@ app function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.box_on_page (id_page,diese_box_on_page,num_box_on_page,id_pion,noeud_start) SELECT $1,diese_box_on_jeu,num_box_on_jeu,id_pion,1 FROM platooschem.box_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO box_on_page (id_page,diese_box_on_page,num_box_on_page,id_pion,noeud_start) SELECT $1,diese_box_on_jeu,num_box_on_jeu,id_pion,1 FROM box_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.stop_box_on_page (id_page,num_box_on_page,noeud_stop) SELECT $1,num_box_on_jeu,0 FROM platooschem.box_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_box_on_page (id_page,num_box_on_page,noeud_stop) SELECT $1,num_box_on_jeu,0 FROM box_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) SELECT $1,diese_bac_on_jeu,num_bac_on_jeu,label_bac,1 FROM platooschem.bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) SELECT $1,diese_bac_on_jeu,num_bac_on_jeu,label_bac,1 FROM bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT $1,num_bac_on_jeu,0 FROM platooschem.bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT $1,num_bac_on_jeu,0 FROM bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.board_on_page (id_page,diese_board_on_page,num_board_on_page,id_board,noeud_start) SELECT $1,diese_board_on_jeu,num_board_on_jeu,id_board,1 FROM platooschem.board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO board_on_page (id_page,diese_board_on_page,num_board_on_page,id_board,noeud_start) SELECT $1,diese_board_on_jeu,num_board_on_jeu,id_board,1 FROM board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.stop_board_on_page (id_page,num_board_on_page,noeud_stop) SELECT $1,num_board_on_jeu,0 FROM platooschem.board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_board_on_page (id_page,num_board_on_page,noeud_stop) SELECT $1,num_board_on_jeu,0 FROM board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.pion_on_bac_on_page (id_page,diese_bac_on_page,id_pion,nombre_pions,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,noeud_start) SELECT $1,'+'diese_bac_on_jeu,id_pion,nombre_pions,diese_pion_on_bac_on_jeu,num_pion_on_bac_on_jeu,1 FROM platooschem.pion_on_bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO pion_on_bac_on_page (id_page,diese_bac_on_page,id_pion,nombre_pions,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,noeud_start) SELECT $1,'+'diese_bac_on_jeu,id_pion,nombre_pions,diese_pion_on_bac_on_jeu,num_pion_on_bac_on_jeu,1 FROM pion_on_bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT $1,diese_bac_on_jeu,num_pion_on_bac_on_jeu,0 FROM platooschem.pion_on_bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT $1,diese_bac_on_jeu,num_pion_on_bac_on_jeu,0 FROM pion_on_bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.pion_on_board_on_page (id_page,diese_board_on_page,id_pion,position_x,position_y,taille,diese_pion_on_board_on_page,num_pion_on_board_on_page,noeud_start) SELECT $1,'+'diese_board_on_jeu,id_pion,position_x,position_y,taille,diese_pion_on_board_on_jeu,num_pion_on_board_on_jeu,1 FROM platooschem.pion_on_board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO pion_on_board_on_page (id_page,diese_board_on_page,id_pion,position_x,position_y,taille,diese_pion_on_board_on_page,num_pion_on_board_on_page,noeud_start) SELECT $1,'+'diese_board_on_jeu,id_pion,position_x,position_y,taille,diese_pion_on_board_on_jeu,num_pion_on_board_on_jeu,1 FROM pion_on_board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT $1,'+'diese_board_on_jeu,num_pion_on_board_on_jeu,0 FROM platooschem.pion_on_board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT $1,'+'diese_board_on_jeu,num_pion_on_board_on_jeu,0 FROM pion_on_board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,'+'id_pion,change_pion,diese_bac_on_jeu,taille FROM platooschem.carac_pions_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,'+'id_pion,change_pion,diese_bac_on_jeu,taille FROM carac_pions_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu] }; queryChainedClient(client,query,callback3,data,resTot); }, function(data,resTot,callback3){ const query={ - text:'INSERT INTO platooschem.carac_pions_joueur_on_page (id_page,id_joueur,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,id_joueur,id_pion,change_pion,diese_bac_on_jeu,taille FROM platooschem.carac_pions_joueur_on_jeu WHERE id_jeu = $2;', + text:'INSERT INTO carac_pions_joueur_on_page (id_page,id_joueur,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,id_joueur,id_pion,change_pion,diese_bac_on_jeu,taille FROM carac_pions_joueur_on_jeu WHERE id_jeu = $2;', values:[data.id_page,data.id_jeu] }; client.query(query,function(err,results){ @@ -658,7 +658,7 @@ app function(callback){ const query={ - text:'SELECT id_page,noeud_courant FROM platooschem.page WHERE nom_page =$1;', + text:'SELECT id_page,noeud_courant FROM page WHERE nom_page =$1;', values:[req.params.pageid] }; client.query(query,function(err,results_1){ @@ -686,7 +686,7 @@ app function(id_page,callback){ const query={ - text:'SELECT nombre_trashs,noeud_courant,creating_date FROM platooschem.page WHERE id_page =$1; ', + text:'SELECT nombre_trashs,noeud_courant,creating_date FROM page WHERE id_page =$1; ', values:[id_page] }; client.query(query,function(err,results){ @@ -707,12 +707,12 @@ app 'fc.label_fonction AS clickable_board, '+ 'pa.nom_pion AS click_board_create_type, '+ 'pb.nom_pion AS click_board_move_type, '+ - 'click_board_move_bac FROM platooschem.joueur_on_page '+ - 'JOIN platooschem.bdd_fonctions fa ON action_clic_onboard = fa.id_fonction '+ - 'JOIN platooschem.bdd_fonctions fb ON action_scroll_onboard = fb.id_fonction '+ - 'JOIN platooschem.bdd_fonctions fc ON clickable_board = fc.id_fonction '+ - 'JOIN platooschem.pion pa ON click_board_create_type = pa.id_pion '+ - 'JOIN platooschem.pion pb ON click_board_move_type = pb.id_pion '+ + 'click_board_move_bac FROM joueur_on_page '+ + 'JOIN bdd_fonctions fa ON action_clic_onboard = fa.id_fonction '+ + 'JOIN bdd_fonctions fb ON action_scroll_onboard = fb.id_fonction '+ + 'JOIN bdd_fonctions fc ON clickable_board = fc.id_fonction '+ + 'JOIN pion pa ON click_board_create_type = pa.id_pion '+ + 'JOIN pion pb ON click_board_move_type = pb.id_pion '+ 'WHERE id_joueur = 1 AND id_page =$1; ', values:[id_page] }; @@ -721,9 +721,9 @@ app function(id_page,results_2,callback){ const query={ text:'SELECT pa.nom_pion AS id_pion, pb.nom_pion AS change_pion, pa.svg_pion AS svg_pion, '+ - 'c.diese_bac_on_page,c.taille FROM platooschem.carac_pions_joueur_on_page c '+ - 'JOIN platooschem.pion pa ON c.id_pion = pa.id_pion '+ - 'JOIN platooschem.pion pb ON c.change_pion = pb.id_pion '+ + 'c.diese_bac_on_page,c.taille FROM carac_pions_joueur_on_page c '+ + 'JOIN pion pa ON c.id_pion = pa.id_pion '+ + 'JOIN pion pb ON c.change_pion = pb.id_pion '+ 'WHERE c.id_joueur = 1 AND c.id_page =$1; ', values:[id_page] }; @@ -731,9 +731,9 @@ app }, function(id_page,results_2,callback){ const query={ - text:'SELECT p.svg_pion,p.nom_pion,b.diese_box_on_page,p.directed,b.num_box_on_page,b.noeud_start,s.nstop noeud_stop FROM platooschem.box_on_page b'+ - ' JOIN platooschem.pion p ON b.id_pion = p.id_pion'+ - ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_box_on_page) num,MAX(id_page) id FROM platooschem.stop_box_on_page WHERE id_page =$1 GROUP BY num_box_on_page) AS s'+ + text:'SELECT p.svg_pion,p.nom_pion,b.diese_box_on_page,p.directed,b.num_box_on_page,b.noeud_start,s.nstop noeud_stop FROM box_on_page b'+ + ' JOIN pion p ON b.id_pion = p.id_pion'+ + ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_box_on_page) num,MAX(id_page) id FROM stop_box_on_page WHERE id_page =$1 GROUP BY num_box_on_page) AS s'+ ' ON b.id_page=s.id AND b.num_box_on_page=s.num'+ ' WHERE b.id_page =$1 ORDER BY b.diese_box_on_page; ', values:[id_page] @@ -742,8 +742,8 @@ app }, function(id_page,results_2,callback){ const query={ - text:'SELECT diese_bac_on_page,num_bac_on_page,label_bac,noeud_start,s.nstop noeud_stop FROM platooschem.bac_on_page'+ - ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_bac_on_page) num,MAX(id_page) id FROM platooschem.stop_bac_on_page WHERE id_page =$1 GROUP BY num_bac_on_page) AS s'+ + text:'SELECT diese_bac_on_page,num_bac_on_page,label_bac,noeud_start,s.nstop noeud_stop FROM bac_on_page'+ + ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_bac_on_page) num,MAX(id_page) id FROM stop_bac_on_page WHERE id_page =$1 GROUP BY num_bac_on_page) AS s'+ ' ON id_page=s.id AND num_bac_on_page=s.num'+ ' WHERE id_page =$1 ORDER BY diese_bac_on_page;', values:[id_page] @@ -752,9 +752,9 @@ app }, function(id_page,results_2,callback){ const query={ - text:'SELECT pp.diese_bac_on_page,p.svg_pion,p.nom_pion,pp.nombre_pions,pp.diese_pion_on_bac_on_page,p.directed,pp.num_pion_on_bac_on_page,pp.noeud_start,s.nstop noeud_stop FROM platooschem.pion_on_bac_on_page pp'+ - ' JOIN platooschem.pion p ON pp.id_pion = p.id_pion'+ - ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_pion_on_bac_on_page) num,MAX(diese_bac_on_page) diese,MAX(id_page) id FROM platooschem.stop_pion_on_bac_on_page WHERE id_page =$1 GROUP BY num_pion_on_bac_on_page) AS s'+ + text:'SELECT pp.diese_bac_on_page,p.svg_pion,p.nom_pion,pp.nombre_pions,pp.diese_pion_on_bac_on_page,p.directed,pp.num_pion_on_bac_on_page,pp.noeud_start,s.nstop noeud_stop FROM pion_on_bac_on_page pp'+ + ' JOIN pion p ON pp.id_pion = p.id_pion'+ + ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_pion_on_bac_on_page) num,MAX(diese_bac_on_page) diese,MAX(id_page) id FROM stop_pion_on_bac_on_page WHERE id_page =$1 GROUP BY num_pion_on_bac_on_page) AS s'+ ' ON pp.id_page=s.id AND pp.num_pion_on_bac_on_page=s.num AND pp.diese_bac_on_page=s.diese'+ ' WHERE pp.id_page = $1 ORDER BY pp.num_pion_on_bac_on_page; ', values:[id_page] @@ -763,9 +763,9 @@ app }, function(id_page,results_2,callback){ const query={ - text:'SELECT bp.num_board_on_page,bp.diese_board_on_page,b.svg_board,b.nom_board,bp.noeud_start,s.nstop noeud_stop FROM platooschem.board_on_page bp'+ - ' JOIN platooschem.board b ON bp.id_board = b.id_board'+ - ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_board_on_page) num,MAX(id_page) id FROM platooschem.stop_board_on_page WHERE id_page =$1 GROUP BY num_board_on_page) AS s'+ + text:'SELECT bp.num_board_on_page,bp.diese_board_on_page,b.svg_board,b.nom_board,bp.noeud_start,s.nstop noeud_stop FROM board_on_page bp'+ + ' JOIN board b ON bp.id_board = b.id_board'+ + ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_board_on_page) num,MAX(id_page) id FROM stop_board_on_page WHERE id_page =$1 GROUP BY num_board_on_page) AS s'+ ' ON bp.id_page=s.id AND bp.num_board_on_page=s.num'+ ' WHERE bp.id_page = $1 ORDER BY diese_board_on_page; ', values:[id_page] @@ -774,9 +774,9 @@ app }, function(id_page,results_2,callback){ const query={ - text:'SELECT pp.diese_board_on_page,pp.diese_pion_on_board_on_page,pp.num_pion_on_board_on_page,p.nom_pion,p.svg_pion,pp.position_x,pp.position_y,pp.taille,p.directed,pp.noeud_start,s.nstop noeud_stop FROM platooschem.pion_on_board_on_page pp'+ - ' JOIN platooschem.pion p ON pp.id_pion = p.id_pion'+ - ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_pion_on_board_on_page) num,MAX(diese_board_on_page) diese,MAX(id_page) id FROM platooschem.stop_pion_on_board_on_page WHERE id_page = $1 GROUP BY num_pion_on_board_on_page) AS s'+ + text:'SELECT pp.diese_board_on_page,pp.diese_pion_on_board_on_page,pp.num_pion_on_board_on_page,p.nom_pion,p.svg_pion,pp.position_x,pp.position_y,pp.taille,p.directed,pp.noeud_start,s.nstop noeud_stop FROM pion_on_board_on_page pp'+ + ' JOIN pion p ON pp.id_pion = p.id_pion'+ + ' JOIN (SELECT ARRAY_AGG(noeud_stop) nstop,MAX(num_pion_on_board_on_page) num,MAX(diese_board_on_page) diese,MAX(id_page) id FROM stop_pion_on_board_on_page WHERE id_page = $1 GROUP BY num_pion_on_board_on_page) AS s'+ ' ON pp.id_page=s.id AND pp.num_pion_on_board_on_page=s.num AND pp.diese_board_on_page=s.diese'+ ' WHERE pp.id_page =$1 ORDER BY num_pion_on_board_on_page;', values:[id_page] @@ -785,42 +785,42 @@ app }, function(id_page,results_2,callback){ const query={ - text:'SELECT id_joueur,label_joueur FROM platooschem.joueur_on_jeu j JOIN platooschem.page p ON j.id_jeu=p.id_jeu_depart WHERE id_page =$1 ORDER BY label_joueur; ', + text:'SELECT id_joueur,label_joueur FROM joueur_on_jeu j JOIN page p ON j.id_jeu=p.id_jeu_depart WHERE id_page =$1 ORDER BY label_joueur; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,results_2); }, function(id_page,results_2,callback){ const query={ - text:'SELECT DISTINCT id_board,nom_board FROM platooschem.board ORDER BY nom_board; ', + text:'SELECT DISTINCT id_board,nom_board FROM board ORDER BY nom_board; ', values:[] }; queryChainedClient(client,query,callback,id_page,results_2); }, function(id_page,results_2,callback){ const query={ - text:'SELECT DISTINCT id_pion,nom_pion FROM platooschem.pion ORDER BY nom_pion; ', + text:'SELECT DISTINCT id_pion,nom_pion FROM pion ORDER BY nom_pion; ', values:[] }; queryChainedClient(client,query,callback,id_page,results_2); }, function(id_page,results_2,callback){ const query={ - text:'SELECT time,message,auteur,couleur,id_message FROM platooschem.chat_on_page WHERE id_page = $1 ORDER BY time DESC; ', + text:'SELECT time,message,auteur,couleur,id_message FROM chat_on_page WHERE id_page = $1 ORDER BY time DESC; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,results_2); }, function(id_page,results_2,callback){ const query={ - text:'SELECT j.wiki AS wiki FROM platooschem.page p JOIN platooschem.jeu j ON p.id_jeu_depart=j.id_jeu;', + text:'SELECT j.wiki AS wiki FROM page p JOIN jeu j ON p.id_jeu_depart=j.id_jeu;', values:[] }; queryChainedClient(client,query,callback,id_page,results_2); }, function(id_page,results_2,callback){ const query={ - text:'SELECT s.noeud_precedent, s.noeud_suivant, s.date, s.auteur, s.couleur, j.label_joueur FROM platooschem.save_on_page s JOIN platooschem.page p ON s.id_page=p.id_page JOIN platooschem.joueur_on_jeu j ON s.id_joueur = j.id_joueur AND p.id_jeu_depart=j.id_jeu WHERE s.id_page =$1;', + text:'SELECT s.noeud_precedent, s.noeud_suivant, s.date, s.auteur, s.couleur, j.label_joueur FROM save_on_page s JOIN page p ON s.id_page=p.id_page JOIN joueur_on_jeu j ON s.id_joueur = j.id_joueur AND p.id_jeu_depart=j.id_jeu WHERE s.id_page =$1;', values:[id_page] }; client.query(query,function(err,results){ @@ -1307,7 +1307,7 @@ io.on('connection',function(socket){ async.waterfall([ function(callback){ const query={ - text:'DELETE FROM platooschem.stop_pion_on_bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_pion_on_bac_on_page WHERE id_page = $1 ; ', values:[resIP[0].id_page] }; client.query(query,function(err,results){ @@ -1324,105 +1324,105 @@ io.on('connection',function(socket){ function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_pion_on_board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_pion_on_board_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.pion_on_bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM pion_on_bac_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.carac_pions_joueur_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM carac_pions_joueur_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.pion_on_board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM pion_on_board_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.carac_pions_page WHERE id_page = $1 ; ', + text:'DELETE FROM carac_pions_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_bac_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM bac_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_box_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_box_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.box_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM box_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_board_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM board_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.chat_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM chat_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.save_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM save_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.joueur_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM joueur_on_page WHERE id_page = $1 ; ', values:[id_page] }; queryChainedClient(client,query,callback,id_page,resTot); }, function(id_page,resTot,callback){ const query={ - text:'DELETE FROM platooschem.page WHERE id_page = $1 ; ', + text:'DELETE FROM page WHERE id_page = $1 ; ', values:[id_page] }; @@ -1490,7 +1490,7 @@ io.on('connection',function(socket){ async.waterfall([ function(callback){ const query={ - text:'DELETE FROM platooschem.stop_pion_on_bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_pion_on_bac_on_page WHERE id_page = $1 ; ', values:[resIP[0].id_page] }; client.query(query,function(err,results){ @@ -1507,196 +1507,196 @@ io.on('connection',function(socket){ function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.pion_on_bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM pion_on_bac_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_pion_on_board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_pion_on_board_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.pion_on_board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM pion_on_board_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.carac_pions_joueur_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM carac_pions_joueur_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.carac_pions_page WHERE id_page = $1 ; ', + text:'DELETE FROM carac_pions_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_bac_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.bac_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM bac_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_box_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_box_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.box_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM box_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.stop_board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM stop_board_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.board_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM board_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.chat_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM chat_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.save_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM save_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'DELETE FROM platooschem.joueur_on_page WHERE id_page = $1 ; ', + text:'DELETE FROM joueur_on_page WHERE id_page = $1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.joueur_on_page (id_page,id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac) SELECT $1,id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac FROM platooschem.joueur_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO joueur_on_page (id_page,id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac) SELECT $1,id_joueur,label_joueur,action_clic_onboard,action_scroll_onboard,clickable_board,click_board_create_type,click_board_move_type,click_board_move_bac FROM joueur_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.save_on_page (id_page,noeud_precedent,noeud_suivant,date,type_action,auteur,couleur,id_joueur) SELECT $1,0,1,CURRENT_TIMESTAMP,\'create\',NULL,NULL,1;', + text:'INSERT INTO save_on_page (id_page,noeud_precedent,noeud_suivant,date,type_action,auteur,couleur,id_joueur) SELECT $1,0,1,CURRENT_TIMESTAMP,\'create\',NULL,NULL,1;', values:[data.id_page] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.box_on_page (id_page,diese_box_on_page,num_box_on_page,id_pion,noeud_start) SELECT $1,'+'diese_box_on_jeu,num_box_on_jeu,id_pion,1 FROM platooschem.box_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO box_on_page (id_page,diese_box_on_page,num_box_on_page,id_pion,noeud_start) SELECT $1,'+'diese_box_on_jeu,num_box_on_jeu,id_pion,1 FROM box_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_box_on_page (id_page,num_box_on_page,noeud_stop) SELECT $1,num_box_on_jeu,0 FROM platooschem.box_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_box_on_page (id_page,num_box_on_page,noeud_stop) SELECT $1,num_box_on_jeu,0 FROM box_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) SELECT $1,'+'diese_bac_on_jeu,num_bac_on_jeu,label_bac,1 FROM platooschem.bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) SELECT $1,'+'diese_bac_on_jeu,num_bac_on_jeu,label_bac,1 FROM bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT $1,num_bac_on_jeu,0 FROM platooschem.bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT $1,num_bac_on_jeu,0 FROM bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.board_on_page (id_page,diese_board_on_page,num_board_on_page,id_board,noeud_start) SELECT $1,diese_board_on_jeu,num_board_on_jeu,id_board,1 FROM platooschem.board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO board_on_page (id_page,diese_board_on_page,num_board_on_page,id_board,noeud_start) SELECT $1,diese_board_on_jeu,num_board_on_jeu,id_board,1 FROM board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_board_on_page (id_page,num_board_on_page,noeud_stop) SELECT $1,num_board_on_jeu,0 FROM platooschem.board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_board_on_page (id_page,num_board_on_page,noeud_stop) SELECT $1,num_board_on_jeu,0 FROM board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.pion_on_bac_on_page (id_page,diese_bac_on_page,id_pion,nombre_pions,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,noeud_start) SELECT $1,'+'diese_bac_on_jeu,id_pion,nombre_pions,diese_pion_on_bac_on_jeu,num_pion_on_bac_on_jeu,1 FROM platooschem.pion_on_bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO pion_on_bac_on_page (id_page,diese_bac_on_page,id_pion,nombre_pions,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,noeud_start) SELECT $1,'+'diese_bac_on_jeu,id_pion,nombre_pions,diese_pion_on_bac_on_jeu,num_pion_on_bac_on_jeu,1 FROM pion_on_bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT $1,diese_bac_on_jeu,num_pion_on_bac_on_jeu,0 FROM platooschem.pion_on_bac_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT $1,diese_bac_on_jeu,num_pion_on_bac_on_jeu,0 FROM pion_on_bac_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.pion_on_board_on_page (id_page,diese_board_on_page,id_pion,position_x,position_y,taille,diese_pion_on_board_on_page,num_pion_on_board_on_page,noeud_start) SELECT $1,'+'diese_board_on_jeu,id_pion,position_x,position_y,taille,diese_pion_on_board_on_jeu,num_pion_on_board_on_jeu,1 FROM platooschem.pion_on_board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO pion_on_board_on_page (id_page,diese_board_on_page,id_pion,position_x,position_y,taille,diese_pion_on_board_on_page,num_pion_on_board_on_page,noeud_start) SELECT $1,'+'diese_board_on_jeu,id_pion,position_x,position_y,taille,diese_pion_on_board_on_jeu,num_pion_on_board_on_jeu,1 FROM pion_on_board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT $1,diese_board_on_jeu,num_pion_on_board_on_jeu,0 FROM platooschem.pion_on_board_on_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT $1,diese_board_on_jeu,num_pion_on_board_on_jeu,0 FROM pion_on_board_on_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,id_pion,change_pion,diese_bac_on_jeu,taille FROM platooschem.carac_pions_jeu WHERE id_jeu = $2; ', + text:'INSERT INTO carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,id_pion,change_pion,diese_bac_on_jeu,taille FROM carac_pions_jeu WHERE id_jeu = $2; ', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); }, function(data,resTot,callback){ const query={ - text:'INSERT INTO platooschem.carac_pions_joueur_on_page (id_page,id_joueur,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,id_joueur,id_pion,change_pion,diese_bac_on_jeu,taille FROM platooschem.carac_pions_joueur_on_jeu WHERE id_jeu = $2;', + text:'INSERT INTO carac_pions_joueur_on_page (id_page,id_joueur,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,id_joueur,id_pion,change_pion,diese_bac_on_jeu,taille FROM carac_pions_joueur_on_jeu WHERE id_jeu = $2;', values:[data.id_page,data.id_jeu_depart] }; queryChainedClient(client,query,callback,data,resTot); @@ -1704,7 +1704,7 @@ io.on('connection',function(socket){ function(id_page,resTot,callback){ const query={ - text:'UPDATE platooschem.page SET noeud_courant=1 WHERE id_page = $1; ', + text:'UPDATE page SET noeud_courant=1 WHERE id_page = $1; ', values:[data.id_page] }; @@ -1746,8 +1746,8 @@ io.on('connection',function(socket){ var query ={ text: 'SELECT fa.label_fonction AS action_clic_onboard, fb.label_fonction AS action_scroll_onboard, fc.label_fonction AS clickable_board, '+ 'pa.nom_pion AS click_board_create_type, pb.nom_pion AS click_board_move_type, j.click_board_move_bac '+ - 'FROM platooschem.joueur_on_page j JOIN platooschem.pion pa ON j.click_board_create_type=pa.id_pion JOIN platooschem.pion pb ON j.click_board_move_type=pb.id_pion '+ - 'JOIN platooschem.bdd_fonctions fa ON j.action_clic_onboard = fa.id_fonction JOIN platooschem.bdd_fonctions fb ON j.action_scroll_onboard = fb.id_fonction JOIN platooschem.bdd_fonctions fc ON j.clickable_board = fc.id_fonction '+ + 'FROM joueur_on_page j JOIN pion pa ON j.click_board_create_type=pa.id_pion JOIN pion pb ON j.click_board_move_type=pb.id_pion '+ + 'JOIN bdd_fonctions fa ON j.action_clic_onboard = fa.id_fonction JOIN bdd_fonctions fb ON j.action_scroll_onboard = fb.id_fonction JOIN bdd_fonctions fc ON j.clickable_board = fc.id_fonction '+ 'WHERE id_page = $1 AND id_joueur = $2; ', values:[resIP[0].id_page,data.id_joueur] } @@ -1808,9 +1808,9 @@ io.on('connection',function(socket){ async.waterfall([ function(callback){ const query={ - text:'INSERT INTO platooschem.chat_on_page (id_page,id_message,auteur,message,couleur,time) '+ + text:'INSERT INTO chat_on_page (id_page,id_message,auteur,message,couleur,time) '+ 'SELECT $1,CASE WHEN MAX(id_message) IS NULL THEN 1 ELSE MAX(id_message)+1 END,'+ - '$2,$3,$4,CURRENT_TIMESTAMP FROM platooschem.chat_on_page WHERE id_page = $5; ', + '$2,$3,$4,CURRENT_TIMESTAMP FROM chat_on_page WHERE id_page = $5; ', values:[resIP[0].id_page,data.auteur,data.message,data.couleur,resIP[0].id_page] }; client.query(query,function(err,results){ @@ -1832,7 +1832,7 @@ io.on('connection',function(socket){ function(id_page,res2,callback){ const query={ - text:'SELECT id_message,time FROM platooschem.chat_on_page WHERE id_page = $1 ORDER BY id_message DESC LIMIT 1 ; ', + text:'SELECT id_message,time FROM chat_on_page WHERE id_page = $1 ORDER BY id_message DESC LIMIT 1 ; ', values:[data.id_page] }; queryChainedClient(client,query,callback,data,res2); @@ -1840,8 +1840,8 @@ io.on('connection',function(socket){ function(id_page,res2,callback){ const query={ - text:'DELETE FROM platooschem.chat_on_page WHERE id_page = $1 AND time <'+ - '(SELECT c.time FROM (SELECT time FROM platooschem.chat_on_page WHERE id_page = $2 ORDER BY time DESC LIMIT 1 OFFSET 19 ) AS c) ; ', + text:'DELETE FROM chat_on_page WHERE id_page = $1 AND time <'+ + '(SELECT c.time FROM (SELECT time FROM chat_on_page WHERE id_page = $2 ORDER BY time DESC LIMIT 1 OFFSET 19 ) AS c) ; ', values:[data.id_page,data.id_page] }; @@ -1898,7 +1898,7 @@ io.on('connection',function(socket){ socket.executeSocket(variables={id_joueur:1},needsData=true,errMess='getTabPion',data=data,FUN=function(resIP){ const query={ text:'SELECT pa.nom_pion AS id_pion,pa.svg_pion AS svg_pion,pb.nom_pion AS change_pion,diese_bac_on_page,c.taille'+ - ' AS taille FROM platooschem.carac_pions_joueur_on_page c JOIN platooschem.pion pa ON c.id_pion=pa.id_pion JOIN platooschem.pion pb ON c.change_pion=pb.id_pion WHERE id_page = $1'+ + ' AS taille FROM carac_pions_joueur_on_page c JOIN pion pa ON c.id_pion=pa.id_pion JOIN pion pb ON c.change_pion=pb.id_pion WHERE id_page = $1'+ ' AND id_joueur = $2;', values:[resIP[0].id_page,data.id_joueur] } @@ -1931,7 +1931,7 @@ io.on('connection',function(socket){ socket.on('add_trash',function(){ socket.executeSocket(variables={},needsData=false,errMess='add_trash',data={},FUN=function(resIP){ const query = { - text:'UPDATE platooschem.page SET nombre_trashs = (nombre_trashs + 1) WHERE id_page = $1 ;', + text:'UPDATE page SET nombre_trashs = (nombre_trashs + 1) WHERE id_page = $1 ;', values:[resIP[0].id_page] } connection.query(query,function(err){ @@ -1949,7 +1949,7 @@ io.on('connection',function(socket){ socket.on('remove_trash',function(){ socket.executeSocket(variables={},needsData=false,errMess='remove_trash',data={},FUN=function(resIP){ const query = { - text:'UPDATE platooschem.page SET nombre_trashs = GREATEST(nombre_trashs -1,0) WHERE id_page = $1 ; ', + text:'UPDATE page SET nombre_trashs = GREATEST(nombre_trashs -1,0) WHERE id_page = $1 ; ', values:[resIP[0].id_page] } connection.query(query,function(err){ @@ -1969,7 +1969,7 @@ io.on('connection',function(socket){ socket.executeSocket(variables={noeud:1},needsData=true,errMess='changeNoeud',data=data,FUN=function(resIP){ const query ={ - text:'SELECT noeud_suivant FROM platooschem.save_on_page WHERE noeud_suivant = $1 AND id_page = $2 ;', + text:'SELECT noeud_suivant FROM save_on_page WHERE noeud_suivant = $1 AND id_page = $2 ;', values:[data.noeud,resIP[0].id_page] } connection.query(query, @@ -1982,7 +1982,7 @@ io.on('connection',function(socket){ socket.emit('refresh'); }else{ const query ={ - text:'UPDATE platooschem.page SET noeud_courant = $1 WHERE id_page = $2 ;', + text:'UPDATE page SET noeud_courant = $1 WHERE id_page = $2 ;', values:[data.noeud,resIP[0].id_page] } connection.query(query, @@ -2053,7 +2053,7 @@ io.on('connection',function(socket){ }, function(callback){ const query={ - text:'SELECT noeud_precedent,noeud_suivant FROM platooschem.save_on_page WHERE id_page = $1;', + text:'SELECT noeud_precedent,noeud_suivant FROM save_on_page WHERE id_page = $1;', values:[resIP[0].id_page] }; client.query(query,function(err,results){ @@ -2077,17 +2077,17 @@ io.on('connection',function(socket){ function(data,resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.save_on_page (id_page,noeud_precedent,noeud_suivant,date,type_action,auteur,couleur,id_joueur) SELECT '+ + text:'INSERT INTO save_on_page (id_page,noeud_precedent,noeud_suivant,date,type_action,auteur,couleur,id_joueur) SELECT '+ '$1,$2,CASE WHEN MAX(noeud_suivant) IS NULL THEN 1 ELSE MAX(noeud_suivant)+1 END,CURRENT_TIMESTAMP,\'add_groupe\',$3,'+ - '$4,$5 FROM platooschem.save_on_page WHERE id_page=$1;', + '$4,$5 FROM save_on_page WHERE id_page=$1;', values:[data.id_page,data.noeud_courant,data.auteur,data.couleur,data.id_joueur] }; queryChainedClient(client,query,callback,data,resNoeuds); }, function(data,resNoeuds,callback){ const query={ - text:'UPDATE platooschem.page AS p SET noeud_courant = s.new_noeud'+ - ' FROM (SELECT MAX(id_page) id_p,MAX(noeud_suivant) new_noeud FROM platooschem.save_on_page GROUP BY id_page) AS s '+ + text:'UPDATE page AS p SET noeud_courant = s.new_noeud'+ + ' FROM (SELECT MAX(id_page) id_p,MAX(noeud_suivant) new_noeud FROM save_on_page GROUP BY id_page) AS s '+ ' WHERE p.id_page=s.id_p AND p.id_page = $1;', values:[data.id_page] }; @@ -2096,7 +2096,7 @@ io.on('connection',function(socket){ function(data,resNoeuds,callback){ const query={ - text:'SELECT noeud_courant AS new_noeud,CURRENT_TIMESTAMP AS date FROM platooschem.page WHERE id_page=$1;', + text:'SELECT noeud_courant AS new_noeud,CURRENT_TIMESTAMP AS date FROM page WHERE id_page=$1;', values:[data.id_page] }; @@ -2189,9 +2189,9 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ - ' SELECT id_page,diese_bac_on_page,num_pion_on_bac_on_page,$1 FROM platooschem.pion_on_bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM platooschem.stop_pion_on_bac_on_page'+ + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ + ' SELECT id_page,diese_bac_on_page,num_pion_on_bac_on_page,$1 FROM pion_on_bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM stop_pion_on_bac_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,diese_bac_on_page,num_pion_on_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_bac_on_page = g.num AND p.diese_bac_on_page=g.diese'+ ' WHERE id_page = $2 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2211,9 +2211,9 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ - ' SELECT id_page,diese_board_on_page,num_pion_on_board_on_page,$1 FROM platooschem.pion_on_board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM platooschem.stop_pion_on_board_on_page'+ + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ + ' SELECT id_page,diese_board_on_page,num_pion_on_board_on_page,$1 FROM pion_on_board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM stop_pion_on_board_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,diese_board_on_page,num_pion_on_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_board_on_page = g.num AND p.diese_board_on_page=g.diese'+ ' WHERE id_page = $2 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2250,10 +2250,10 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) SELECT $1'+ + text:'INSERT INTO bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) SELECT $1'+ ', CASE WHEN MAX(diese_bac_on_page) IS NULL THEN 1 ELSE MAX(diese_bac_on_page)+1 END, '+ 'CASE WHEN MAX(num_bac_on_page) IS NULL THEN 0 ELSE MAX(num_bac_on_page)+1 END,'+ - '$2,$3 FROM platooschem.bac_on_page WHERE id_page = $1 ;', + '$2,$3 FROM bac_on_page WHERE id_page = $1 ;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.label,resNoeuds[3][0].new_noeud], }; client.query(query,function(err,results){ @@ -2269,8 +2269,8 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT $1'+ - ' ,MAX(num_bac_on_page),0 FROM platooschem.bac_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT $1'+ + ' ,MAX(num_bac_on_page),0 FROM bac_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; @@ -2278,7 +2278,7 @@ io.on('connection',function(socket){ }, function(resNoeuds,resTot,callback){ const query={ - text:'SELECT MAX(diese_bac_on_page) diese,MAX(num_bac_on_page) num FROM platooschem.bac_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'SELECT MAX(diese_bac_on_page) diese,MAX(num_bac_on_page) num FROM bac_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; @@ -2309,7 +2309,7 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query = { - text:'SELECT id_pion,taille,svg_pion FROM platooschem.pion WHERE nom_pion = $1; ', + text:'SELECT id_pion,taille,svg_pion FROM pion WHERE nom_pion = $1; ', values:[requetes_tot[nb_requete].data.nom] } client.query(query,function(err,results){ @@ -2324,7 +2324,7 @@ io.on('connection',function(socket){ }, function(resNoeuds,resPion,callback){ const query = { - text:'SELECT id_pion FROM platooschem.carac_pions_page c JOIN platooschem.page p ON c.id_page = p.id_page WHERE p.id_page = $1;', + text:'SELECT id_pion FROM carac_pions_page c JOIN page p ON c.id_page = p.id_page WHERE p.id_page = $1;', values:[resIP[0].id_page] } client.query(query,function(err,results){ @@ -2372,11 +2372,11 @@ io.on('connection',function(socket){ N:N } const query={ - text:'INSERT INTO platooschem.box_on_page (id_page,id_pion,diese_box_on_page,num_box_on_page,noeud_start) SELECT $1'+ - ',$2, new_diese, new_num, $3 FROM platooschem.box_on_page b JOIN (SELECT '+ + text:'INSERT INTO box_on_page (id_page,id_pion,diese_box_on_page,num_box_on_page,noeud_start) SELECT $1'+ + ',$2, new_diese, new_num, $3 FROM box_on_page b JOIN (SELECT '+ 'CASE WHEN MAX(diese_box_on_page) IS NULL THEN 1 ELSE MAX(diese_box_on_page)+1 END new_diese,'+ 'CASE WHEN MAX(num_box_on_page) IS NULL THEN 1 ELSE MAX(num_box_on_page)+1 END new_num,MAX(id_page) id_pageb'+ - ' FROM platooschem.box_on_page GROUP BY id_page) AS bb ON b.id_page=bb.id_pageb'+ + ' FROM box_on_page GROUP BY id_page) AS bb ON b.id_page=bb.id_pageb'+ ' WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,r.resPion[0][0].id_pion,r.resNoeuds[3][0].new_noeud], }; @@ -2392,8 +2392,8 @@ io.on('connection',function(socket){ }, function(r,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_box_on_page (id_page,num_box_on_page,noeud_stop) SELECT $1'+ - ' ,MAX(num_box_on_page),0 FROM platooschem.box_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_box_on_page (id_page,num_box_on_page,noeud_stop) SELECT $1'+ + ' ,MAX(num_box_on_page),0 FROM box_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; queryChainedClient(client,query,callback,r,resTot); @@ -2401,7 +2401,7 @@ io.on('connection',function(socket){ function(r,resTot,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,$2,$2,1,$3 ; ', + text:'INSERT INTO carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT $1,$2,$2,1,$3 ; ', values:[resIP[0].id_page,r.resPion[0][0].id_pion,r.resPion[0][0].taille] }; client.query(query,function(err,results){ @@ -2421,8 +2421,8 @@ io.on('connection',function(socket){ function(r,resTot,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,'+ - '$1,$2,$2,1,$3 FROM platooschem.carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', + text:'INSERT INTO carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,'+ + '$1,$2,$2,1,$3 FROM carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,r.resPion[0][0].id_pion,r.resPion[0][0].taille] }; client.query(query,function(err,results){ @@ -2441,7 +2441,7 @@ io.on('connection',function(socket){ }, function(r,resTot,callback){ const query={ - text:'SELECT MAX(diese_box_on_page) diese,MAX(num_box_on_page) num FROM platooschem.box_on_page WHERE id_page = $1; ', + text:'SELECT MAX(diese_box_on_page) diese,MAX(num_box_on_page) num FROM box_on_page WHERE id_page = $1; ', values:[resIP[0].id_page] }; @@ -2476,7 +2476,7 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query={ - text:'SELECT id_board,svg_board FROM platooschem.board WHERE nom_board = $1;', + text:'SELECT id_board,svg_board FROM board WHERE nom_board = $1;', values:[requetes_tot[nb_requete].data.nom] }; client.query(query, @@ -2505,12 +2505,12 @@ io.on('connection',function(socket){ }, function(r,callback){ const query={ - text:'INSERT INTO platooschem.board_on_page (id_page,diese_board_on_page,num_board_on_page,id_board,noeud_start) SELECT '+ + text:'INSERT INTO board_on_page (id_page,diese_board_on_page,num_board_on_page,id_board,noeud_start) SELECT '+ '$1, new_diese, new_num, $2,$3'+ - ' FROM platooschem.page b LEFT JOIN (SELECT '+ + ' FROM page b LEFT JOIN (SELECT '+ 'CASE WHEN MAX(diese_board_on_page) IS NULL THEN 1 ELSE MAX(diese_board_on_page)+1 END new_diese, '+ 'CASE WHEN MAX(num_board_on_page) IS NULL THEN 1 ELSE MAX(num_board_on_page)+1 END new_num,MAX(id_page) id_pageb'+ - ' FROM platooschem.board_on_page GROUP BY id_page) AS bb ON b.id_page=bb.id_pageb'+ + ' FROM board_on_page GROUP BY id_page) AS bb ON b.id_page=bb.id_pageb'+ ' WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,r.resPion[0].id_board,r.resNoeuds[3][0].new_noeud], }; @@ -2527,8 +2527,8 @@ io.on('connection',function(socket){ function(r,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_board_on_page (id_page,num_board_on_page,noeud_stop) SELECT $1'+ - ' ,MAX(num_board_on_page),0 FROM platooschem.board_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_board_on_page (id_page,num_board_on_page,noeud_stop) SELECT $1'+ + ' ,MAX(num_board_on_page),0 FROM board_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; @@ -2536,7 +2536,7 @@ io.on('connection',function(socket){ }, function(r,resTot,callback){ const query={ - text:' SELECT MAX(diese_board_on_page) diese,MAX(num_board_on_page) num FROM platooschem.board_on_page WHERE id_page = $1 GROUP BY id_page;', + text:' SELECT MAX(diese_board_on_page) diese,MAX(num_board_on_page) num FROM board_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; client.query(query,function(err,results){ @@ -2574,8 +2574,8 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:' SELECT id_page,num_board_on_page,$1 FROM platooschem.board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM platooschem.stop_board_on_page'+ + text:' SELECT id_page,num_board_on_page,$1 FROM board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM stop_board_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,num_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_board_on_page = g.num'+ ' WHERE id_page = $2 AND diese_board_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2599,9 +2599,9 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ - ' SELECT id_page,diese_board_on_page,num_pion_on_board_on_page,$1 FROM platooschem.pion_on_board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM platooschem.stop_pion_on_board_on_page'+ + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ + ' SELECT id_page,diese_board_on_page,num_pion_on_board_on_page,$1 FROM pion_on_board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM stop_pion_on_board_on_page'+ ' WHERE id_page = $2 AND diese_board_on_page = $3 AND ARRAY[noeud_stop] <@ $4 GROUP BY id_page,diese_board_on_page,num_pion_on_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_board_on_page = g.num AND p.diese_board_on_page=g.diese'+ ' WHERE id_page = $2 AND diese_board_on_page = $3 AND ARRAY[noeud_start] <@ $4 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2620,9 +2620,9 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_board_on_page (id_page,num_board_on_page,noeud_stop)'+ - ' SELECT id_page,num_board_on_page,$1 FROM platooschem.board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM platooschem.stop_board_on_page'+ + text:'INSERT INTO stop_board_on_page (id_page,num_board_on_page,noeud_stop)'+ + ' SELECT id_page,num_board_on_page,$1 FROM board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM stop_board_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,num_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_board_on_page = g.num'+ ' WHERE id_page = $2 AND diese_board_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2653,8 +2653,8 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:' SELECT num_bac_on_page FROM platooschem.bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM platooschem.stop_bac_on_page'+ + text:' SELECT num_bac_on_page FROM bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM stop_bac_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,num_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_bac_on_page = g.num'+ ' WHERE id_page = $1 AND diese_bac_on_page = $3 AND ARRAY[noeud_start] <@ $2 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2678,7 +2678,7 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'UPDATE platooschem.joueur_on_page SET click_board_move_bac = null WHERE id_page = $1 AND click_board_move_bac = $2 ; ', + text:'UPDATE joueur_on_page SET click_board_move_bac = null WHERE id_page = $1 AND click_board_move_bac = $2 ; ', values:[resIP[0].id_page,id] }; client.query(query,function(err,results){ @@ -2694,7 +2694,7 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'UPDATE platooschem.carac_pions_page SET diese_bac_on_page = null WHERE id_page = $1 AND diese_bac_on_page = $2 ; ', + text:'UPDATE carac_pions_page SET diese_bac_on_page = null WHERE id_page = $1 AND diese_bac_on_page = $2 ; ', values:[resIP[0].id_page,id] }; @@ -2703,7 +2703,7 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'UPDATE platooschem.carac_pions_joueur_on_page SET diese_bac_on_page = null WHERE id_page = $1 AND diese_bac_on_page = $2 ; ', + text:'UPDATE carac_pions_joueur_on_page SET diese_bac_on_page = null WHERE id_page = $1 AND diese_bac_on_page = $2 ; ', values:[resIP[0].id_page,id] }; @@ -2712,9 +2712,9 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ - ' SELECT id_page,diese_bac_on_page,num_pion_on_bac_on_page,$1 FROM platooschem.pion_on_bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM platooschem.stop_pion_on_bac_on_page'+ + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ + ' SELECT id_page,diese_bac_on_page,num_pion_on_bac_on_page,$1 FROM pion_on_bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM stop_pion_on_bac_on_page'+ ' WHERE id_page = $2 AND diese_bac_on_page = $3 AND ARRAY[noeud_stop] <@ $4 GROUP BY id_page,diese_bac_on_page,num_pion_on_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_bac_on_page = g.num AND p.diese_bac_on_page=g.diese'+ ' WHERE id_page = $2 AND diese_bac_on_page = $3 AND ARRAY[noeud_start] <@ $4 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2726,9 +2726,9 @@ io.on('connection',function(socket){ function(resNoeuds,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_bac_on_page (id_page,num_bac_on_page,noeud_stop)'+ - ' SELECT id_page,num_bac_on_page,$1 FROM platooschem.bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM platooschem.stop_bac_on_page'+ + text:'INSERT INTO stop_bac_on_page (id_page,num_bac_on_page,noeud_stop)'+ + ' SELECT id_page,num_bac_on_page,$1 FROM bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM stop_bac_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,num_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_bac_on_page = g.num'+ ' WHERE id_page = $2 AND diese_bac_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2760,8 +2760,8 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:' SELECT num_box_on_page,$1 FROM platooschem.box_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_box_on_page) num FROM platooschem.stop_box_on_page'+ + text:' SELECT num_box_on_page,$1 FROM box_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_box_on_page) num FROM stop_box_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,num_box_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_box_on_page = g.num'+ ' WHERE id_page = $2 AND diese_box_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2786,9 +2786,9 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.stop_box_on_page (id_page,num_box_on_page,noeud_stop)'+ - ' SELECT id_page,num_box_on_page,$1 FROM platooschem.box_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_box_on_page) num FROM platooschem.stop_box_on_page'+ + text:'INSERT INTO stop_box_on_page (id_page,num_box_on_page,noeud_stop)'+ + ' SELECT id_page,num_box_on_page,$1 FROM box_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_box_on_page) num FROM stop_box_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,num_box_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_box_on_page = g.num'+ ' WHERE id_page = $2 AND diese_box_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2816,8 +2816,8 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query={ - text:' SELECT num_pion_on_board_on_page FROM platooschem.pion_on_board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM platooschem.stop_pion_on_board_on_page'+ + text:' SELECT num_pion_on_board_on_page FROM pion_on_board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM stop_pion_on_board_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,diese_board_on_page,num_pion_on_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_board_on_page = g.num AND p.diese_board_on_page=g.diese'+ ' WHERE id_page = $1 AND num_pion_on_board_on_page = $3 AND ARRAY[noeud_start] <@ $2 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2843,9 +2843,9 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ - ' SELECT id_page,diese_board_on_page,num_pion_on_board_on_page,$1 FROM platooschem.pion_on_board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM platooschem.stop_pion_on_board_on_page'+ + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ + ' SELECT id_page,diese_board_on_page,num_pion_on_board_on_page,$1 FROM pion_on_board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM stop_pion_on_board_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,diese_board_on_page,num_pion_on_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_board_on_page = g.num AND p.diese_board_on_page=g.diese'+ ' WHERE id_page = $2 AND num_pion_on_board_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2875,8 +2875,8 @@ io.on('connection',function(socket){ function(resNoeuds,callback){ const query={ - text:'SELECT num_pion_on_bac_on_page FROM platooschem.pion_on_bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM platooschem.stop_pion_on_bac_on_page'+ + text:'SELECT num_pion_on_bac_on_page FROM pion_on_bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM stop_pion_on_bac_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,diese_bac_on_page,num_pion_on_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_bac_on_page = g.num AND p.diese_bac_on_page=g.diese'+ ' WHERE id_page = $1 AND num_pion_on_bac_on_page = $3 AND ARRAY[noeud_start] <@ $2 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2900,9 +2900,9 @@ io.on('connection',function(socket){ }, function(resNoeuds,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ - ' SELECT id_page,diese_bac_on_page,num_pion_on_bac_on_page,$1 FROM platooschem.pion_on_bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM platooschem.stop_pion_on_bac_on_page'+ + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ + ' SELECT id_page,diese_bac_on_page,num_pion_on_bac_on_page,$1 FROM pion_on_bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM stop_pion_on_bac_on_page'+ ' WHERE id_page = $2 AND ARRAY[noeud_stop] <@ $3 GROUP BY id_page,diese_bac_on_page,num_pion_on_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_bac_on_page = g.num AND p.diese_bac_on_page=g.diese'+ ' WHERE id_page = $2 AND num_pion_on_bac_on_page = $4 AND ARRAY[noeud_start] <@ $3 AND ( COALESCE(g.nbstop,0)=0 OR g.nbstop=0) ;', @@ -2953,8 +2953,8 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query = { - text:'SELECT num_pion_on_board_on_page,diese_board_on_page FROM platooschem.pion_on_board_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM platooschem.stop_pion_on_board_on_page'+ + text:'SELECT num_pion_on_board_on_page,diese_board_on_page FROM pion_on_board_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_board_on_page) num, MAX(diese_board_on_page) diese FROM stop_pion_on_board_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,diese_board_on_page,num_pion_on_board_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_board_on_page = g.num AND p.diese_board_on_page=g.diese'+ ' WHERE id_page = $1 AND diese_pion_on_board_on_page = $3'+ @@ -2975,22 +2975,22 @@ io.on('connection',function(socket){ function(resNoeuds,results2,callback){ const query = { - text:'SELECT id_pion,taille,svg_pion,directed FROM platooschem.pion WHERE nom_pion = $1;', + text:'SELECT id_pion,taille,svg_pion,directed FROM pion WHERE nom_pion = $1;', values:[requetes_tot[nb_requete].data.type] } queryChainedClient(client,query,callback,resNoeuds,results2); }, function(resNoeuds,results2,callback){ const query = { - text:'SELECT c.id_pion FROM platooschem.carac_pions_page c JOIN platooschem.pion p ON c.id_pion = p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', + text:'SELECT c.id_pion FROM carac_pions_page c JOIN pion p ON c.id_pion = p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', values:[requetes_tot[nb_requete].data.type,resIP[0].id_page] } queryChainedClient(client,query,callback,resNoeuds,results2); }, function(resNoeuds,results2,callback){ const query = { - text:'SELECT num_board_on_page FROM platooschem.board_on_page b'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM platooschem.stop_board_on_page'+ + text:'SELECT num_board_on_page FROM board_on_page b'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM stop_board_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,num_board_on_page) AS g'+ ' ON b.id_page=g.id AND b.num_board_on_page = g.num'+ ' WHERE b.id_page = $1 AND diese_board_on_page=$3'+ @@ -3021,11 +3021,11 @@ io.on('connection',function(socket){ //test pour savoir si on doit ajouter des caractéristiques de pion à la page r.test = results2[1].length!=1; const query={ - text:'INSERT INTO platooschem.pion_on_board_on_page (id_page,diese_pion_on_board_on_page,num_pion_on_board_on_page,id_pion,diese_board_on_page,position_x,position_y,taille,noeud_start) '+ + text:'INSERT INTO pion_on_board_on_page (id_page,diese_pion_on_board_on_page,num_pion_on_board_on_page,id_pion,diese_board_on_page,position_x,position_y,taille,noeud_start) '+ ' SELECT $1,$2, pp.new_num,$3,$4,$5,$6,$7, new_noeud '+ - ' FROM platooschem.page p LEFT JOIN '+ - '(SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM platooschem.save_on_page GROUP BY id_page) AS s ON p.id_page=s.id_pageb'+ - ' LEFT JOIN (SELECT MAX(num_pion_on_board_on_page)+1 new_num, MAX(id_page) id_pagec FROM platooschem.pion_on_board_on_page GROUP BY id_page) AS pp ON p.id_page=pp.id_pagec'+ + ' FROM page p LEFT JOIN '+ + '(SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM save_on_page GROUP BY id_page) AS s ON p.id_page=s.id_pageb'+ + ' LEFT JOIN (SELECT MAX(num_pion_on_board_on_page)+1 new_num, MAX(id_page) id_pagec FROM pion_on_board_on_page GROUP BY id_page) AS pp ON p.id_page=pp.id_pagec'+ ' WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,requetes_tot[nb_requete].data.diese,r.results2[1][0].id_pion,requetes_tot[nb_requete].data.board,requetes_tot[nb_requete].data.left,requetes_tot[nb_requete].data.top,requetes_tot[nb_requete].data.height] }; @@ -3042,7 +3042,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop)'+ ' SELECT $1,$2,$3,$4; ', values:[resIP[0].id_page,r.results2[0][0].diese_board_on_page,r.results2[0][0].num_pion_on_board_on_page,r.resNoeuds[3][0].new_noeud], }; @@ -3050,15 +3050,15 @@ io.on('connection',function(socket){ }, function(r,result3,callback){ const query = { - text:' SELECT MAX(num_pion_on_board_on_page) num FROM platooschem.pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', + text:' SELECT MAX(num_pion_on_board_on_page) num FROM pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] } queryChainedClient(client,query,callback,r,result3); }, function(r,result3,callback){ const query = { - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT '+ - '$1,$2 ,MAX(num_pion_on_board_on_page),0 FROM platooschem.pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT '+ + '$1,$2 ,MAX(num_pion_on_board_on_page),0 FROM pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.board] } queryChainedClient(client,query,callback,r,result3); @@ -3067,7 +3067,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT ($1,$2,$2,1,$3) ; ', + text:'INSERT INTO carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT ($1,$2,$2,1,$3) ; ', values:[resIP[0].id_page,r.results2[1][0].id_pion,r.results2[1][0].taille] }; @@ -3088,7 +3088,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,$1,$2,$2,1,$3 FROM platooschem.carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', + text:'INSERT INTO carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,$1,$2,$2,1,$3 FROM carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,results2[1][0].id_pion,results2[1][0].taille] }; @@ -3142,8 +3142,8 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query = { - text:'SELECT num_pion_on_bac_on_page FROM platooschem.pion_on_bac_on_page p'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM platooschem.stop_pion_on_bac_on_page'+ + text:'SELECT num_pion_on_bac_on_page FROM pion_on_bac_on_page p'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_pion_on_bac_on_page) num, MAX(diese_bac_on_page) diese FROM stop_pion_on_bac_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,diese_bac_on_page,num_pion_on_bac_on_page) AS g'+ ' ON p.id_page=g.id AND p.num_pion_on_bac_on_page = g.num AND p.diese_bac_on_page=g.diese'+ ' WHERE id_page = $1 AND diese_pion_on_bac_on_page = $3'+ @@ -3163,22 +3163,22 @@ io.on('connection',function(socket){ function(resNoeuds,results2,callback){ const query = { - text:'SELECT id_pion,taille,svg_pion,directed FROM platooschem.pion WHERE nom_pion = $1;', + text:'SELECT id_pion,taille,svg_pion,directed FROM pion WHERE nom_pion = $1;', values:[requetes_tot[nb_requete].data.type] } queryChainedClient(client,query,callback,resNoeuds,results2); }, function(resNoeuds,results2,callback){ const query = { - text:'SELECT c.id_pion FROM platooschem.carac_pions_page c JOIN platooschem.pion p ON c.id_pion = p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', + text:'SELECT c.id_pion FROM carac_pions_page c JOIN pion p ON c.id_pion = p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', values:[requetes_tot[nb_requete].data.type,resIP[0].id_page] } queryChainedClient(client,query,callback,resNoeuds,results2); }, function(resNoeuds,results2,callback){ const query = { - text:'SELECT num_bac_on_page FROM platooschem.bac_on_page b'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM platooschem.stop_bac_on_page'+ + text:'SELECT num_bac_on_page FROM bac_on_page b'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM stop_bac_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,num_bac_on_page) AS g'+ ' ON b.id_page=g.id AND b.num_bac_on_page = g.num'+ ' WHERE b.id_page = $1 AND diese_bac_on_page=$3'+ @@ -3206,7 +3206,7 @@ io.on('connection',function(socket){ }, function(r,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop)'+ ' SELECT $1,$2,$3,$4; ', values:[resIP[0].id_page,requetes_tot[nb_requete].data.bac,r.results2[0][0].num_pion_on_bac_on_page,r.resNoeuds[3][0].new_noeud], }; @@ -3223,11 +3223,11 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query={ - text:'INSERT INTO platooschem.pion_on_bac_on_page (id_page,diese_bac_on_page,id_pion,nombre_pions,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,noeud_start) SELECT '+ - '$1,$2,$3,$4,$5, new_num, new_noeud FROM platooschem.page p'+ - ' LEFT JOIN (SELECT MAX(id_page) id_pagea,MAX(num_pion_on_bac_on_page)+1 new_num FROM platooschem.pion_on_bac_on_page GROUP BY id_page) AS n '+ + text:'INSERT INTO pion_on_bac_on_page (id_page,diese_bac_on_page,id_pion,nombre_pions,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,noeud_start) SELECT '+ + '$1,$2,$3,$4,$5, new_num, new_noeud FROM page p'+ + ' LEFT JOIN (SELECT MAX(id_page) id_pagea,MAX(num_pion_on_bac_on_page)+1 new_num FROM pion_on_bac_on_page GROUP BY id_page) AS n '+ 'ON p.id_page=n.id_pagea '+ - 'LEFT JOIN (SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM platooschem.save_on_page GROUP BY id_page) AS s '+ + 'LEFT JOIN (SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM save_on_page GROUP BY id_page) AS s '+ 'ON n.id_pagea=s.id_pageb WHERE id_pagea=$1 LIMIT 1;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.bac,r.results2[1][0].id_pion,requetes_tot[nb_requete].data.n,requetes_tot[nb_requete].data.diese] }; @@ -3237,8 +3237,8 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query = { - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT '+ - '$1,$2 ,MAX(num_pion_on_bac_on_page),0 FROM platooschem.pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT '+ + '$1,$2 ,MAX(num_pion_on_bac_on_page),0 FROM pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.bac] } queryChainedClient(client,query,callback,r,result3); @@ -3246,7 +3246,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query={ - text:' SELECT MAX(num_pion_on_bac_on_page) num FROM platooschem.pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page;', + text:' SELECT MAX(num_pion_on_bac_on_page) num FROM pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; @@ -3292,7 +3292,7 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query = { - text:'SELECT id_pion,taille,svg_pion,directed FROM platooschem.pion WHERE nom_pion = $1;', + text:'SELECT id_pion,taille,svg_pion,directed FROM pion WHERE nom_pion = $1;', values:[requetes_tot[nb_requete].data.type] } client.query(query,function(err,results){ @@ -3307,7 +3307,7 @@ io.on('connection',function(socket){ function(resNoeuds,results2,callback){ const query = { - text:'SELECT c.id_pion FROM platooschem.carac_pions_page c JOIN platooschem.pion p ON c.id_pion=p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', + text:'SELECT c.id_pion FROM carac_pions_page c JOIN pion p ON c.id_pion=p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', values:[requetes_tot[nb_requete].data.type,resIP[0].id_page] } queryChainedClient(client,query,callback,resNoeuds,results2); @@ -3315,8 +3315,8 @@ io.on('connection',function(socket){ function(resNoeuds,results2,callback){ const query = { - text:'SELECT num_board_on_page FROM platooschem.board_on_page b'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM platooschem.stop_board_on_page'+ + text:'SELECT num_board_on_page FROM board_on_page b'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_board_on_page) num FROM stop_board_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,num_board_on_page) AS g'+ ' ON b.id_page=g.id AND b.num_board_on_page = g.num'+ ' WHERE b.id_page = $1 AND diese_board_on_page=$3'+ @@ -3348,10 +3348,10 @@ io.on('connection',function(socket){ //test pour savoir si on doit ajouter des caractéristiques de pion à la page r.test = r.results2[1].length!=1; const query={ - text:'INSERT INTO platooschem.pion_on_board_on_page (id_page,diese_pion_on_board_on_page,num_pion_on_board_on_page,id_pion,diese_board_on_page,position_x,position_y,taille,noeud_start) '+ + text:'INSERT INTO pion_on_board_on_page (id_page,diese_pion_on_board_on_page,num_pion_on_board_on_page,id_pion,diese_board_on_page,position_x,position_y,taille,noeud_start) '+ ' SELECT $1,CASE WHEN pp.new_diese IS NULL THEN 1 ELSE new_diese END, '+ - ' CASE WHEN pp.new_num IS NULL THEN 0 ELSE new_num END,$2,$3, $4,$5 , $6,$7 FROM platooschem.page p'+ - ' LEFT JOIN (SELECT MAX(num_pion_on_board_on_page)+1 new_num, MAX(diese_pion_on_board_on_page)+1 new_diese, MAX(id_page) id_pagec FROM platooschem.pion_on_board_on_page GROUP BY id_page) AS pp ON p.id_page=pp.id_pagec'+ + ' CASE WHEN pp.new_num IS NULL THEN 0 ELSE new_num END,$2,$3, $4,$5 , $6,$7 FROM page p'+ + ' LEFT JOIN (SELECT MAX(num_pion_on_board_on_page)+1 new_num, MAX(diese_pion_on_board_on_page)+1 new_diese, MAX(id_page) id_pagec FROM pion_on_board_on_page GROUP BY id_page) AS pp ON p.id_page=pp.id_pagec'+ ' WHERE id_page = $1 LIMIT 1;', values:[resIP[0].id_page,r.results2[0][0].id_pion,requetes_tot[nb_requete].data.board,requetes_tot[nb_requete].data.left,requetes_tot[nb_requete].data.top,requetes_tot[nb_requete].data.height,r.resNoeuds[3][0].new_noeud], }; @@ -3368,8 +3368,8 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT '+ - '$1,$2 ,MAX(num_pion_on_board_on_page),0 FROM platooschem.pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_pion_on_board_on_page (id_page,diese_board_on_page,num_pion_on_board_on_page,noeud_stop) SELECT '+ + '$1,$2 ,MAX(num_pion_on_board_on_page),0 FROM pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.board] }; @@ -3378,7 +3378,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query = { - text:' SELECT MAX(diese_pion_on_board_on_page) diese,MAX(num_pion_on_board_on_page) num FROM platooschem.pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', + text:' SELECT MAX(diese_pion_on_board_on_page) diese,MAX(num_pion_on_board_on_page) num FROM pion_on_board_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] } queryChainedClient(client,query,callback,r,result3); @@ -3387,7 +3387,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT ($1,$2,$2,1,$3) ; ', + text:'INSERT INTO carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT ($1,$2,$2,1,$3) ; ', values:[resIP[0].id_page,r.results2[1][0].id_pion,r.results2[1][0].taille] }; @@ -3408,7 +3408,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,$1,$2,$2,1,$3 FROM platooschem.carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', + text:'INSERT INTO carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,$1,$2,$2,1,$3 FROM carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,r.results2[1][0].id_pion,r.results2[1][0].taille] }; @@ -3456,7 +3456,7 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query = { - text:'SELECT id_pion,taille,svg_pion FROM platooschem.pion WHERE nom_pion = $1;', + text:'SELECT id_pion,taille,svg_pion FROM pion WHERE nom_pion = $1;', values:[requetes_tot[nb_requete].data.type] } client.query(query,function(err,results){ @@ -3472,7 +3472,7 @@ io.on('connection',function(socket){ function(resNoeuds,results2,callback){ const query = { - text:'SELECT c.id_pion FROM platooschem.carac_pions_page c JOIN platooschem.pion p ON c.id_pion=p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', + text:'SELECT c.id_pion FROM carac_pions_page c JOIN pion p ON c.id_pion=p.id_pion WHERE p.nom_pion = $1 AND c.id_page = $2; ', values:[requetes_tot[nb_requete].data.type,resIP[0].id_page] } queryChainedClient(client,query,callback,resNoeuds,results2); @@ -3480,8 +3480,8 @@ io.on('connection',function(socket){ function(resNoeuds,results2,callback){ const query = { - text:'SELECT num_bac_on_page FROM platooschem.bac_on_page b'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM platooschem.stop_bac_on_page'+ + text:'SELECT num_bac_on_page FROM bac_on_page b'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM stop_bac_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,num_bac_on_page) AS g'+ ' ON b.id_page=g.id AND b.num_bac_on_page = g.num'+ ' WHERE b.id_page = $1 AND diese_bac_on_page=$3'+ @@ -3511,14 +3511,14 @@ io.on('connection',function(socket){ //test pour savoir si on doit ajouter des caractéristiques de pion à la page r.test = r.results2[1].length!=1; const query={ - text:'INSERT INTO platooschem.pion_on_bac_on_page (id_page,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,id_pion,diese_bac_on_page,nombre_pions,noeud_start) '+ + text:'INSERT INTO pion_on_bac_on_page (id_page,diese_pion_on_bac_on_page,num_pion_on_bac_on_page,id_pion,diese_bac_on_page,nombre_pions,noeud_start) '+ ' SELECT $1'+ ', CASE WHEN new_diese IS NULL THEN 1 ELSE new_diese END,'+ ' CASE WHEN new_num IS NULL THEN 0 ELSE new_num END, '+ '$2,$3, $4, new_noeud '+ - ' FROM platooschem.page p LEFT JOIN '+ - '(SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM platooschem.save_on_page GROUP BY id_page) AS s ON p.id_page=s.id_pageb'+ - ' LEFT JOIN (SELECT MAX(num_pion_on_bac_on_page)+1 new_num, MAX(diese_pion_on_bac_on_page)+1 new_diese, MAX(id_page) id_pagec FROM platooschem.pion_on_bac_on_page GROUP BY id_page) AS pp ON p.id_page=pp.id_pagec'+ + ' FROM page p LEFT JOIN '+ + '(SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM save_on_page GROUP BY id_page) AS s ON p.id_page=s.id_pageb'+ + ' LEFT JOIN (SELECT MAX(num_pion_on_bac_on_page)+1 new_num, MAX(diese_pion_on_bac_on_page)+1 new_diese, MAX(id_page) id_pagec FROM pion_on_bac_on_page GROUP BY id_page) AS pp ON p.id_page=pp.id_pagec'+ ' WHERE id_page = $1 LIMIT 1;', values:[resIP[0].id_page,r.results2[0][0].id_pion,requetes_tot[nb_requete].data.bac,requetes_tot[nb_requete].data.n], }; @@ -3535,8 +3535,8 @@ io.on('connection',function(socket){ function(r,result3,callback){ const query={ - text:'INSERT INTO platooschem.stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT '+ - '$1,$2 ,MAX(num_pion_on_bac_on_page),0 FROM platooschem.pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_pion_on_bac_on_page (id_page,diese_bac_on_page,num_pion_on_bac_on_page,noeud_stop) SELECT '+ + '$1,$2 ,MAX(num_pion_on_bac_on_page),0 FROM pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.bac] }; @@ -3544,7 +3544,7 @@ io.on('connection',function(socket){ }, function(r,result3,callback){ const query = { - text:' SELECT MAX(diese_pion_on_bac_on_page) diese,MAX(num_pion_on_bac_on_page) num FROM platooschem.pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page; ', + text:' SELECT MAX(diese_pion_on_bac_on_page) diese,MAX(num_pion_on_bac_on_page) num FROM pion_on_bac_on_page WHERE id_page = $1 GROUP BY id_page; ', values:[resIP[0].id_page] } queryChainedClient(client,query,callback,r,result3); @@ -3553,7 +3553,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT ($1,$2,$2,1,$3) ; ', + text:'INSERT INTO carac_pions_page (id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT ($1,$2,$2,1,$3) ; ', values:[resIP[0].id_page,r.results2[1][0].id_pion,r.results2[1][0].taille] }; @@ -3574,7 +3574,7 @@ io.on('connection',function(socket){ function(r,result3,callback){ if(r.test){ const query={ - text:'INSERT INTO platooschem.carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,$1,$2,$2,1,$3 FROM platooschem.carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', + text:'INSERT INTO carac_pions_joueur_on_page (id_joueur,id_page,id_pion,change_pion,diese_bac_on_page,taille) SELECT id_joueur,$1,$2,$2,1,$3 FROM carac_pions_joueur_on_page WHERE id_page = $1 LIMIT 1; ', values:[resIP[0].id_page,r.results2[1][0].id_pion,r.results2[1][0].taille] }; @@ -3618,8 +3618,8 @@ io.on('connection',function(socket){ Array_waterfall=Array_waterfall.concat([ function(resNoeuds,callback){ const query={ - text:'SELECT num_bac_on_page FROM platooschem.bac_on_page b'+ - ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM platooschem.stop_bac_on_page'+ + text:'SELECT num_bac_on_page FROM bac_on_page b'+ + ' LEFT JOIN (SELECT COUNT(noeud_stop) nbstop,MAX(id_page) id, MAX(num_bac_on_page) num FROM stop_bac_on_page'+ ' WHERE id_page = $1 AND ARRAY[noeud_stop] <@ $2 GROUP BY id_page,num_bac_on_page) AS g'+ ' ON b.id_page=g.id AND b.num_bac_on_page = g.num'+ ' WHERE b.id_page = $1 AND diese_bac_on_page=$3'+ @@ -3653,7 +3653,7 @@ io.on('connection',function(socket){ }, function(r,callback){ const query={ - text:'INSERT INTO platooschem.stop_bac_on_page (id_page,num_bac_on_page,noeud_stop)'+ + text:'INSERT INTO stop_bac_on_page (id_page,num_bac_on_page,noeud_stop)'+ ' SELECT $1,$2,$3;', values:[resIP[0].id_page,r.results2[0].num_bac_on_page,r.resNoeuds[3][0].new_noeud], }; @@ -3670,10 +3670,10 @@ io.on('connection',function(socket){ function(r,resTot,callback){ const query={ - text:'INSERT INTO platooschem.bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) '+ - ' SELECT $1,$2, new_num, $3, new_noeud FROM platooschem.page p LEFT JOIN '+ - '(SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM platooschem.save_on_page GROUP BY id_page) AS s ON p.id_page=s.id_pageb'+ - ' LEFT JOIN (SELECT MAX(num_bac_on_page)+1 new_num,MAX(id_page) id_pagec FROM platooschem.bac_on_page GROUP BY id_page) AS b ON p.id_page=b.id_pagec'+ + text:'INSERT INTO bac_on_page (id_page,diese_bac_on_page,num_bac_on_page,label_bac,noeud_start) '+ + ' SELECT $1,$2, new_num, $3, new_noeud FROM page p LEFT JOIN '+ + '(SELECT MAX(id_page) id_pageb,MAX(noeud_suivant) new_noeud FROM save_on_page GROUP BY id_page) AS s ON p.id_page=s.id_pageb'+ + ' LEFT JOIN (SELECT MAX(num_bac_on_page)+1 new_num,MAX(id_page) id_pagec FROM bac_on_page GROUP BY id_page) AS b ON p.id_page=b.id_pagec'+ ' WHERE id_page = $1 LIMIT 1;', values:[resIP[0].id_page,requetes_tot[nb_requete].data.diese,requetes_tot[nb_requete].data.label] }; @@ -3682,8 +3682,8 @@ io.on('connection',function(socket){ }, function(r,resTot,callback){ const query={ - text:'INSERT INTO platooschem.stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT '+ - '$1,MAX(num_bac_on_page),0 FROM platooschem.bac_on_page WHERE id_page = $1 GROUP BY id_page;', + text:'INSERT INTO stop_bac_on_page (id_page,num_bac_on_page,noeud_stop) SELECT '+ + '$1,MAX(num_bac_on_page),0 FROM bac_on_page WHERE id_page = $1 GROUP BY id_page;', values:[resIP[0].id_page] }; @@ -3692,7 +3692,7 @@ io.on('connection',function(socket){ function(r,resTot,callback){ const query={ - text:'SELECT MAX(num_bac_on_page) num FROM platooschem.bac_on_page WHERE id_page = $1 GROUP BY id_page; ', + text:'SELECT MAX(num_bac_on_page) num FROM bac_on_page WHERE id_page = $1 GROUP BY id_page; ', values:[resIP[0].id_page] };