[phpmyadmin/phpmyadmin] ce6c46: Fixes #11509, #11512, #11518.

1 Oct 2015


      Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ce6c465d15e35282fc708366dd486f8a763980df
      https://github.com/phpmyadmin/phpmyadmin/commit/ce6c465d15e35282fc708366dd48...
  Author: Dan Ungureanu <udan1107@gmail.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M libraries/sql-parser/src/Component.php
    M libraries/sql-parser/src/Components/AlterOperation.php
    M libraries/sql-parser/src/Components/Array2d.php
    M libraries/sql-parser/src/Components/ArrayObj.php
    M libraries/sql-parser/src/Components/Condition.php
    M libraries/sql-parser/src/Components/CreateDefinition.php
    M libraries/sql-parser/src/Components/DataType.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/ExpressionArray.php
    M libraries/sql-parser/src/Components/FunctionCall.php
    M libraries/sql-parser/src/Components/IntoKeyword.php
    M libraries/sql-parser/src/Components/JoinKeyword.php
    M libraries/sql-parser/src/Components/Key.php
    M libraries/sql-parser/src/Components/Limit.php
    M libraries/sql-parser/src/Components/OptionsArray.php
    M libraries/sql-parser/src/Components/OrderKeyword.php
    M libraries/sql-parser/src/Components/ParameterDefinition.php
    M libraries/sql-parser/src/Components/PartitionDefinition.php
    M libraries/sql-parser/src/Components/Reference.php
    M libraries/sql-parser/src/Components/RenameOperation.php
    M libraries/sql-parser/src/Components/SetOperation.php
    M libraries/sql-parser/src/Context.php
    M libraries/sql-parser/src/Contexts/ContextMySql50000.php
    M libraries/sql-parser/src/Contexts/ContextMySql50100.php
    M libraries/sql-parser/src/Contexts/ContextMySql50500.php
    M libraries/sql-parser/src/Contexts/ContextMySql50600.php
    M libraries/sql-parser/src/Contexts/ContextMySql50700.php
    M libraries/sql-parser/src/Lexer.php
    M libraries/sql-parser/src/Parser.php
    M libraries/sql-parser/src/Statement.php
    M libraries/sql-parser/src/Statements/AlterStatement.php
    M libraries/sql-parser/src/Statements/CreateStatement.php
    M libraries/sql-parser/src/Token.php
    M libraries/sql-parser/src/Utils/BufferedQuery.php
    M libraries/sql-parser/src/Utils/Error.php
    M libraries/sql-parser/src/Utils/Formatter.php
    A libraries/sql-parser/src/Utils/Tokens.php
    A libraries/sql-parser/src/common.php
    M tbl_export.php

  Log Message:
  -----------
  Fixes #11509, #11512, #11518.
Updated sql-parser library to udan11/sql-parser@2f5d2daabbf7057141a97a69936ff217df6085f6 (v2.1.1).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>


  Commit: f289725c068c3372a9ffffa19d4702fd945d187c
      https://github.com/phpmyadmin/phpmyadmin/commit/f289725c068c3372a9ffffa19d47...
  Author: Marc Delisle <marc@infomarc.info>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M libraries/sql-parser/src/Component.php
    M libraries/sql-parser/src/Components/AlterOperation.php
    M libraries/sql-parser/src/Components/Array2d.php
    M libraries/sql-parser/src/Components/ArrayObj.php
    M libraries/sql-parser/src/Components/Condition.php
    M libraries/sql-parser/src/Components/CreateDefinition.php
    M libraries/sql-parser/src/Components/DataType.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/ExpressionArray.php
    M libraries/sql-parser/src/Components/FunctionCall.php
    M libraries/sql-parser/src/Components/IntoKeyword.php
    M libraries/sql-parser/src/Components/JoinKeyword.php
    M libraries/sql-parser/src/Components/Key.php
    M libraries/sql-parser/src/Components/Limit.php
    M libraries/sql-parser/src/Components/OptionsArray.php
    M libraries/sql-parser/src/Components/OrderKeyword.php
    M libraries/sql-parser/src/Components/ParameterDefinition.php
    M libraries/sql-parser/src/Components/PartitionDefinition.php
    M libraries/sql-parser/src/Components/Reference.php
    M libraries/sql-parser/src/Components/RenameOperation.php
    M libraries/sql-parser/src/Components/SetOperation.php
    M libraries/sql-parser/src/Context.php
    M libraries/sql-parser/src/Contexts/ContextMySql50000.php
    M libraries/sql-parser/src/Contexts/ContextMySql50100.php
    M libraries/sql-parser/src/Contexts/ContextMySql50500.php
    M libraries/sql-parser/src/Contexts/ContextMySql50600.php
    M libraries/sql-parser/src/Contexts/ContextMySql50700.php
    M libraries/sql-parser/src/Lexer.php
    M libraries/sql-parser/src/Parser.php
    M libraries/sql-parser/src/Statement.php
    M libraries/sql-parser/src/Statements/AlterStatement.php
    M libraries/sql-parser/src/Statements/CreateStatement.php
    M libraries/sql-parser/src/Token.php
    M libraries/sql-parser/src/Utils/BufferedQuery.php
    M libraries/sql-parser/src/Utils/Error.php
    M libraries/sql-parser/src/Utils/Formatter.php
    A libraries/sql-parser/src/Utils/Tokens.php
    A libraries/sql-parser/src/common.php
    M tbl_export.php

  Log Message:
  -----------
  Merge pull request #11523 from udan11/QA_4_5

Fixes #11509, #11512, #11518.


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/50c34261e323...f289725c068c

Marc Delisle

tags

participants (1)