Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cab738cbed36fab06bdbe8d322d0cd049a33d510
https://github.com/phpmyadmin/phpmyadmin/commit/cab738cbed36fab06bdbe8d322d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
M libraries/insert_edit.lib.php
M tbl_replace.php
Log Message:
-----------
Fix #11909 Can't insert row into table that contains generated column
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 3a054c82d04bd279fc244164d04574c70a97ac9b
https://github.com/phpmyadmin/phpmyadmin/commit/3a054c82d04bd279fc244164d04…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Conflicts:
ChangeLog
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a5406ca993c...3a054c82d04b
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 7e12feba5440aca64570d14bae8af76c12b2e542
https://github.com/phpmyadmin/phpmyadmin/commit/7e12feba5440aca64570d14bae8…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Updated sql-parser library to phpmyadmin/sql-parser@38b10f585ac012554f8a3d0dd6e7e3fd255ff94f (v3.1.0).
The update includes multiple fixes:
- Fixes #11885. Call to undefined function SqlParser\ctype_alnum()
- Fixes #11879. 4.5.3.1 - NOW() function not recognized by parser
- Fixes #11867. Gracefully handle the DESC statement
- Fixes #11843. Fractional timestamp causes corrupted SQL export
- Fixes #11836. Static analysis error for valid WHERE condition with IF keyword
- Fixes #11800. Syntax Verifier error using REGEXP in SQL statement
- Fixes #11799. Backslashes in comments are being interpreted as escape characters
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 9389db2916c334c3c475dab9fa9f2cd0a76a9a70
https://github.com/phpmyadmin/phpmyadmin/commit/9389db2916c334c3c475dab9fa9…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Added changelog entries for 7e12feba5440aca64570d14bae8af76c12b2e542.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 7b80d2cb3d62af0fd68b85dae630d0f01fdfb5ce
https://github.com/phpmyadmin/phpmyadmin/commit/7b80d2cb3d62af0fd68b85dae63…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge pull request #11935 from udan11/QA_4_5
Updated sql-parser
Commit: 5a5406ca993c8e4cbb46bb62e2e5f1c82598f3e9
https://github.com/phpmyadmin/phpmyadmin/commit/5a5406ca993c8e4cbb46bb62e2e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge branch 'QA_4_5' into QA_4_6
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/33718de82f2d...5a5406ca993c
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 7e12feba5440aca64570d14bae8af76c12b2e542
https://github.com/phpmyadmin/phpmyadmin/commit/7e12feba5440aca64570d14bae8…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Updated sql-parser library to phpmyadmin/sql-parser@38b10f585ac012554f8a3d0dd6e7e3fd255ff94f (v3.1.0).
The update includes multiple fixes:
- Fixes #11885. Call to undefined function SqlParser\ctype_alnum()
- Fixes #11879. 4.5.3.1 - NOW() function not recognized by parser
- Fixes #11867. Gracefully handle the DESC statement
- Fixes #11843. Fractional timestamp causes corrupted SQL export
- Fixes #11836. Static analysis error for valid WHERE condition with IF keyword
- Fixes #11800. Syntax Verifier error using REGEXP in SQL statement
- Fixes #11799. Backslashes in comments are being interpreted as escape characters
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 9389db2916c334c3c475dab9fa9f2cd0a76a9a70
https://github.com/phpmyadmin/phpmyadmin/commit/9389db2916c334c3c475dab9fa9…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Added changelog entries for 7e12feba5440aca64570d14bae8af76c12b2e542.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 7b80d2cb3d62af0fd68b85dae630d0f01fdfb5ce
https://github.com/phpmyadmin/phpmyadmin/commit/7b80d2cb3d62af0fd68b85dae63…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge pull request #11935 from udan11/QA_4_5
Updated sql-parser
Commit: 5a5406ca993c8e4cbb46bb62e2e5f1c82598f3e9
https://github.com/phpmyadmin/phpmyadmin/commit/5a5406ca993c8e4cbb46bb62e2e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge branch 'QA_4_5' into QA_4_6
Commit: 7cea850fd7f6a83a7956ec675dc1f9da7e314d87
https://github.com/phpmyadmin/phpmyadmin/commit/7cea850fd7f6a83a7956ec675dc…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/823489908e3e...7cea850fd7f6
Branch: refs/heads/QA_4_5
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 7e12feba5440aca64570d14bae8af76c12b2e542
https://github.com/phpmyadmin/phpmyadmin/commit/7e12feba5440aca64570d14bae8…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Updated sql-parser library to phpmyadmin/sql-parser@38b10f585ac012554f8a3d0dd6e7e3fd255ff94f (v3.1.0).
The update includes multiple fixes:
- Fixes #11885. Call to undefined function SqlParser\ctype_alnum()
- Fixes #11879. 4.5.3.1 - NOW() function not recognized by parser
- Fixes #11867. Gracefully handle the DESC statement
- Fixes #11843. Fractional timestamp causes corrupted SQL export
- Fixes #11836. Static analysis error for valid WHERE condition with IF keyword
- Fixes #11800. Syntax Verifier error using REGEXP in SQL statement
- Fixes #11799. Backslashes in comments are being interpreted as escape characters
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 9389db2916c334c3c475dab9fa9f2cd0a76a9a70
https://github.com/phpmyadmin/phpmyadmin/commit/9389db2916c334c3c475dab9fa9…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Added changelog entries for 7e12feba5440aca64570d14bae8af76c12b2e542.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 7b80d2cb3d62af0fd68b85dae630d0f01fdfb5ce
https://github.com/phpmyadmin/phpmyadmin/commit/7b80d2cb3d62af0fd68b85dae63…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
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/Expression.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/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Formatter.php
Log Message:
-----------
Merge pull request #11935 from udan11/QA_4_5
Updated sql-parser
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/afe00d7c10f5...7b80d2cb3d62
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 33718de82f2dda55a747c2aa3c7cd9e7bda2dfa9
https://github.com/phpmyadmin/phpmyadmin/commit/33718de82f2dda55a747c2aa3c7…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
M libraries/controllers/table/TableStructureController.php
M templates/table/structure/display_structure.phtml
Log Message:
-----------
Fix #11923 Errors on Structure tab when user only has select access on certain columns
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>