[phpMyAdmin Git] [phpmyadmin/phpmyadmin] dfc6f7: Remember MySQL links internally in the database in...

Wed Oct 25 12:05:58 CEST 2017

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dfc6f7bf8eef9001f34d1950411bdb9a3cf9244f
      https://github.com/phpmyadmin/phpmyadmin/commit/dfc6f7bf8eef9001f34d1950411bdb9a3cf9244f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php

  Log Message:
  -----------
  Remember MySQL links internally in the database interface

This should replace $GLOBALS['userlink']/$GLOBALS['controllink'].

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 60c1b32472646ddf0851155ae0002c3e49f93f6f
      https://github.com/phpmyadmin/phpmyadmin/commit/60c1b32472646ddf0851155ae0002c3e49f93f6f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/CentralColumns.php
    M libraries/classes/Database/DatabaseList.php
    M libraries/classes/DatabaseInterface.php
    M libraries/classes/Header.php
    M libraries/classes/ListDatabase.php
    M libraries/classes/Normalization.php
    M libraries/classes/Server/Privileges.php
    M libraries/common.inc.php
    M libraries/dbi/dbi_dummy.inc.php
    M libraries/server_common.inc.php
    M test/classes/Dbi/DbiMysqlTest.php
    M test/classes/Dbi/DbiMysqliTest.php

  Log Message:
  -----------
  Remove usage of $GLOBALS['userlink']

The links are internal to DatabaseInterface and user link is default.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 329ce22b73b701c3e0d106615e1d77b71487b63a
      https://github.com/phpmyadmin/phpmyadmin/commit/329ce22b73b701c3e0d106615e1d77b71487b63a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php
    M libraries/common.inc.php

  Log Message:
  -----------
  Correctly handle fallback control user connection using user parameters

Remember it as CONNECT_CONTROL and avoid running post connect handler.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: afa5aa132819bc994b16ae63098e3ca54ea4939b
      https://github.com/phpmyadmin/phpmyadmin/commit/afa5aa132819bc994b16ae63098e3ca54ea4939b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/Footer.php

  Log Message:
  -----------
  Simplify condition for checking link existence

As the control link is same as user link if none is defined
we can check only if user is logged in.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: deed987f15d44645bef117b9e9599ae059b86ae8
      https://github.com/phpmyadmin/phpmyadmin/commit/deed987f15d44645bef117b9e9599ae059b86ae8
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M test/bootstrap-dist.php

  Log Message:
  -----------
  Always define PMA_Config in tests

It is needed for template rendering, so most tests need it.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 4fe87fb5925ec45cc2d740a643b96dab64e7f52b
      https://github.com/phpmyadmin/phpmyadmin/commit/4fe87fb5925ec45cc2d740a643b96dab64e7f52b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/Bookmark.php
    M libraries/classes/CentralColumns.php
    M libraries/classes/Controllers/Server/ServerDatabasesController.php
    M libraries/classes/Database/Qbe.php
    M libraries/classes/DatabaseInterface.php
    M libraries/classes/Display/Export.php
    M libraries/classes/Navigation/Nodes/Node.php
    M libraries/classes/Plugins/Export/ExportSql.php
    M libraries/classes/PmdCommon.php
    M libraries/classes/RecentFavoriteTable.php
    M libraries/classes/Relation.php
    M libraries/classes/Server/Privileges.php
    M libraries/classes/Table.php
    M libraries/classes/Tracker.php
    M libraries/classes/Transformations.php
    M libraries/classes/UserPreferences.php
    M libraries/dbi/dbi_dummy.inc.php
    M test/classes/CentralColumnsTest.php
    M test/classes/Controllers/Server/ServerVariablesControllerTest.php
    M test/classes/Database/DesignerTest.php
    M test/classes/NormalizationTest.php
    M test/classes/Plugins/Export/ExportHtmlwordTest.php
    M test/classes/Plugins/Export/ExportOdtTest.php
    M test/classes/Plugins/Export/ExportSqlTest.php
    M test/classes/Plugins/Export/ExportTexytextTest.php
    M test/classes/Plugins/Schema/DiaRelationSchemaTest.php
    M test/classes/Plugins/Schema/EpsRelationSchemaTest.php
    M test/classes/Plugins/Schema/PdfRelationSchemaTest.php
    M test/classes/Plugins/Schema/SvgRelationSchemaTest.php
    M test/classes/PmdCommonTest.php
    M test/classes/ReplicationGuiTest.php
    M test/classes/Rte/RoutinesTest.php
    M test/classes/Server/Status/AdvisorTest.php
    M test/classes/Server/Status/DataTest.php
    M test/classes/Server/Status/MonitorTest.php
    M test/classes/Server/Status/QueriesTest.php
    M test/classes/Server/Status/VariablesTest.php
    M test/classes/Server/StatusTest.php
    M test/classes/TableTest.php
    M test/classes/TrackerTest.php
    M test/classes/UserPreferencesTest.php

  Log Message:
  -----------
  Remove usage of $GLOBALS['controllink']

This is now stored internally inside DatabaseInterface instance.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 5f29ace249ed6daaa1c67f6a7dd417ac1e8a1d20
      https://github.com/phpmyadmin/phpmyadmin/commit/5f29ace249ed6daaa1c67f6a7dd417ac1e8a1d20
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php

  Log Message:
  -----------
  Simplify DatabaseInterface link parameter handling

- check validy only when invoking low level calls
- avoid too early array usage

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 398e7b8e585513f481a039882c1cd71926debdb9
      https://github.com/phpmyadmin/phpmyadmin/commit/398e7b8e585513f481a039882c1cd71926debdb9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php

  Log Message:
  -----------
  Avoid poluting user cache without database connection

Returning false is obviously faster than dealing with the cache.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 33cfe75e9f11a628bf20477e8c34def13b26c86a
      https://github.com/phpmyadmin/phpmyadmin/commit/33cfe75e9f11a628bf20477e8c34def13b26c86a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php

  Log Message:
  -----------
  Return calculated value from isUserType

There is no need to hit the cache again to read the value.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: feb56e7f49cbe29c28e30b7c27e37ca6ef0cdb67
      https://github.com/phpmyadmin/phpmyadmin/commit/feb56e7f49cbe29c28e30b7c27e37ca6ef0cdb67
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/Sql.php

  Log Message:
  -----------
  Correctly define connection type

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: ae0a259bacd923feb50fd42bad6066eddbe2986e
      https://github.com/phpmyadmin/phpmyadmin/commit/ae0a259bacd923feb50fd42bad6066eddbe2986e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php
    M libraries/classes/Util.php

  Log Message:
  -----------
  Move link parameter as last in getTablesFull

It is currently not used here, so move it to the end.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 2c248fa83d46c81bbf534ac363975320623900a4
      https://github.com/phpmyadmin/phpmyadmin/commit/2c248fa83d46c81bbf534ac363975320623900a4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php

  Log Message:
  -----------
  Fix documentation for DatabaseInterface::getDefinition

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 99e47a90d9ab5c02a2215e1b5494493853bffd77
      https://github.com/phpmyadmin/phpmyadmin/commit/99e47a90d9ab5c02a2215e1b5494493853bffd77
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/Controllers/Server/ServerBinlogController.php
    M libraries/classes/Controllers/Table/TableRelationController.php
    M libraries/classes/Controllers/Table/TableSearchController.php
    M libraries/classes/Core.php
    M libraries/classes/Display/Results.php
    M libraries/classes/InsertEdit.php
    M libraries/classes/Menu.php
    M libraries/classes/Plugins/Export/ExportCsv.php
    M libraries/classes/Plugins/Export/ExportHtmlword.php
    M libraries/classes/Plugins/Export/ExportJson.php
    M libraries/classes/Plugins/Export/ExportLatex.php
    M libraries/classes/Plugins/Export/ExportMediawiki.php
    M libraries/classes/Plugins/Export/ExportOds.php
    M libraries/classes/Plugins/Export/ExportOdt.php
    M libraries/classes/Plugins/Export/ExportPhparray.php
    M libraries/classes/Plugins/Export/ExportSql.php
    M libraries/classes/Plugins/Export/ExportTexytext.php
    M libraries/classes/Plugins/Export/ExportXml.php
    M libraries/classes/Plugins/Export/ExportYaml.php
    M libraries/classes/Plugins/Export/Helpers/Pdf.php
    M libraries/classes/Plugins/Schema/TableStats.php
    M libraries/classes/PmdCommon.php
    M libraries/classes/Server/Privileges.php
    M libraries/classes/Table.php
    M libraries/db_table_exists.inc.php
    M templates/table/relation/foreign_key_row.phtml
    M test/classes/InsertEditTest.php
    M test/classes/Plugins/Export/ExportCsvTest.php
    M test/classes/Plugins/Export/ExportHtmlwordTest.php
    M test/classes/Plugins/Export/ExportMediawikiTest.php
    M test/classes/Plugins/Export/ExportOdsTest.php
    M test/classes/Plugins/Export/ExportOdtTest.php
    M test/classes/Plugins/Export/ExportPhparrayTest.php
    M test/classes/Plugins/Export/ExportTexytextTest.php
    M test/classes/Plugins/Export/ExportXmlTest.php
    M test/classes/Plugins/Export/ExportYamlTest.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Always define correct connection type

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 1f968ce29bff9ca8e5b30eaeb92a645fcf833ef8
      https://github.com/phpmyadmin/phpmyadmin/commit/1f968ce29bff9ca8e5b30eaeb92a645fcf833ef8
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/DatabaseInterface.php

  Log Message:
  -----------
  Fix setting variable

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 701a8855fdb4c992e3882b76c40a92c2610891ba
      https://github.com/phpmyadmin/phpmyadmin/commit/701a8855fdb4c992e3882b76c40a92c2610891ba
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M libraries/classes/Bookmark.php
    M libraries/classes/CentralColumns.php
    M libraries/classes/Controllers/Server/ServerBinlogController.php
    M libraries/classes/Controllers/Server/ServerDatabasesController.php
    M libraries/classes/Controllers/Table/TableRelationController.php
    M libraries/classes/Controllers/Table/TableSearchController.php
    M libraries/classes/Core.php
    M libraries/classes/Database/DatabaseList.php
    M libraries/classes/Database/Qbe.php
    M libraries/classes/DatabaseInterface.php
    M libraries/classes/Display/Export.php
    M libraries/classes/Display/Results.php
    M libraries/classes/Footer.php
    M libraries/classes/Header.php
    M libraries/classes/InsertEdit.php
    M libraries/classes/ListDatabase.php
    M libraries/classes/Menu.php
    M libraries/classes/Navigation/Nodes/Node.php
    M libraries/classes/Normalization.php
    M libraries/classes/Plugins/Export/ExportCsv.php
    M libraries/classes/Plugins/Export/ExportHtmlword.php
    M libraries/classes/Plugins/Export/ExportJson.php
    M libraries/classes/Plugins/Export/ExportLatex.php
    M libraries/classes/Plugins/Export/ExportMediawiki.php
    M libraries/classes/Plugins/Export/ExportOds.php
    M libraries/classes/Plugins/Export/ExportOdt.php
    M libraries/classes/Plugins/Export/ExportPhparray.php
    M libraries/classes/Plugins/Export/ExportSql.php
    M libraries/classes/Plugins/Export/ExportTexytext.php
    M libraries/classes/Plugins/Export/ExportXml.php
    M libraries/classes/Plugins/Export/ExportYaml.php
    M libraries/classes/Plugins/Export/Helpers/Pdf.php
    M libraries/classes/Plugins/Schema/TableStats.php
    M libraries/classes/PmdCommon.php
    M libraries/classes/RecentFavoriteTable.php
    M libraries/classes/Relation.php
    M libraries/classes/Server/Privileges.php
    M libraries/classes/Sql.php
    M libraries/classes/Table.php
    M libraries/classes/Tracker.php
    M libraries/classes/Transformations.php
    M libraries/classes/UserPreferences.php
    M libraries/classes/Util.php
    M libraries/common.inc.php
    M libraries/db_table_exists.inc.php
    M libraries/dbi/dbi_dummy.inc.php
    M libraries/server_common.inc.php
    M templates/table/relation/foreign_key_row.phtml
    M test/bootstrap-dist.php
    M test/classes/CentralColumnsTest.php
    M test/classes/Controllers/Server/ServerVariablesControllerTest.php
    M test/classes/Database/DesignerTest.php
    M test/classes/Dbi/DbiMysqlTest.php
    M test/classes/Dbi/DbiMysqliTest.php
    M test/classes/InsertEditTest.php
    M test/classes/NormalizationTest.php
    M test/classes/Plugins/Export/ExportCsvTest.php
    M test/classes/Plugins/Export/ExportHtmlwordTest.php
    M test/classes/Plugins/Export/ExportMediawikiTest.php
    M test/classes/Plugins/Export/ExportOdsTest.php
    M test/classes/Plugins/Export/ExportOdtTest.php
    M test/classes/Plugins/Export/ExportPhparrayTest.php
    M test/classes/Plugins/Export/ExportSqlTest.php
    M test/classes/Plugins/Export/ExportTexytextTest.php
    M test/classes/Plugins/Export/ExportXmlTest.php
    M test/classes/Plugins/Export/ExportYamlTest.php
    M test/classes/Plugins/Schema/DiaRelationSchemaTest.php
    M test/classes/Plugins/Schema/EpsRelationSchemaTest.php
    M test/classes/Plugins/Schema/PdfRelationSchemaTest.php
    M test/classes/Plugins/Schema/SvgRelationSchemaTest.php
    M test/classes/PmdCommonTest.php
    M test/classes/ReplicationGuiTest.php
    M test/classes/Rte/RoutinesTest.php
    M test/classes/Server/Status/AdvisorTest.php
    M test/classes/Server/Status/DataTest.php
    M test/classes/Server/Status/MonitorTest.php
    M test/classes/Server/Status/QueriesTest.php
    M test/classes/Server/Status/VariablesTest.php
    M test/classes/Server/StatusTest.php
    M test/classes/TableTest.php
    M test/classes/TrackerTest.php
    M test/classes/UserPreferencesTest.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Merge pull request #13770 from nijel/dbi

Database interface cleanups

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/125aa9ab8e70...701a8855fdb4