[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 171f4b: Fix #16342 Alias in multi-table query

[Petr Duda]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 171f4bf376a2218c8ff391073a74b0a617d0bc82
https://github.com/phpmyadmin/phpmyadmin/commit/171f4bf376a2218c8ff391073a74b0a617d0bc82
Author: Petr Duda <petrduda at seznam.cz>
Date: 2020-09-12 (Sat, 09 September 2020) +02:00

Changed paths: 
M js/database/multi_table_query.js

Log Message:
-----------
Fix #16342 Alias in multi-table query

Signed-off-by: Petr Duda <petrduda at seznam.cz>

Commit: 653c63009a3533bc9c888ae3c9459697abfd3a2f
https://github.com/phpmyadmin/phpmyadmin/commit/653c63009a3533bc9c888ae3c9459697abfd3a2f
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-09-20 (Sun, 09 September 2020) +02:00

Changed paths: 
M js/database/multi_table_query.js

Log Message:
-----------
Merge #16343 - Fix #16342 - In Multi-table query (db_multi_table_query.php) alias show the same alias for all columns

Pull-request: #16343
Fixes: #16342

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 28a777817325784d6c83ff231dabcaeac1eb1c5e
https://github.com/phpmyadmin/phpmyadmin/commit/28a777817325784d6c83ff231dabcaeac1eb1c5e
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-09-20 (Sun, 09 September 2020) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #16342

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: ffc971a4d3fc071230e0878a6ed9eadddc5fd508
https://github.com/phpmyadmin/phpmyadmin/commit/ffc971a4d3fc071230e0878a6ed9eadddc5fd508
Author: Petr Duda <petrduda at seznam.cz>
Date: 2020-09-20 (Sun, 09 September 2020) +02:00

Changed paths: 
M libraries/classes/InsertEdit.php

Log Message:
-----------
Fix #16325 Editing geometry data throws error on using the GUI

Signed-off-by: Petr Duda <petrduda at seznam.cz>

Commit: 4f8e1b8d5a2c7f23dd06b91d86a3d9e317b1f580
https://github.com/phpmyadmin/phpmyadmin/commit/4f8e1b8d5a2c7f23dd06b91d86a3d9e317b1f580
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-09-20 (Sun, 09 September 2020) +02:00

Changed paths: 
M libraries/classes/InsertEdit.php

Log Message:
-----------
Merge #16330 - Fix #16325, Fix #15109 - Editing geometry data throws error on using the GUI

Pull-request: #16330
Fixes: #16325
Fixes: #15109

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 6c135c5f0b0be7dfea1904f9c1bcb301be42d3c9
https://github.com/phpmyadmin/phpmyadmin/commit/6c135c5f0b0be7dfea1904f9c1bcb301be42d3c9
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-09-20 (Sun, 09 September 2020) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #15109 and #16325

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: a4120025eca0ea6edf15e555913f4fea3ab6a54f
https://github.com/phpmyadmin/phpmyadmin/commit/a4120025eca0ea6edf15e555913f4fea3ab6a54f
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-09-20 (Sun, 09 September 2020) +02:00

Changed paths: 
M ChangeLog
M js/src/database/multi_table_query.js
M libraries/classes/InsertEdit.php

Log Message:
-----------
Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes at wdes.fr>