Commit Graph

105 Commits

Author SHA1 Message Date
Marc Delisle
fd7c8522ea Clarify method name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-03 10:14:29 -04:00
Marc Delisle
75acdb1344 Merge branch 'QA_4_5' 2015-10-01 11:29:29 -04:00
Marc Delisle
3df771238e Fixes #11524 Yellow star does not change in database Structure after add/remove from favorites
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-01 11:28:29 -04:00
Madhura Jayaratne
11981e8bd9 Hide values column for HASH and KEY partition types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-01 07:08:14 +10:00
Madhura Jayaratne
d0efeac744 Allow adding and editing partitions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-30 21:18:04 +10:00
Madhura Jayaratne
7ec4bcdbea Use include for files being included conditionally
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:11:11 +10:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:06:58 +10:00
Madhura Jayaratne
c196b189af Remove Drizzle support from table related functionalities
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:44 +10:00
Madhura Jayaratne
f3ff8403f2 Remove more Drizzle support
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:39 +10:00
Madhura Jayaratne
9843e00e7b Merge branch 'QA_4_5' 2015-09-02 23:01:15 +10:00
Madhura Jayaratne
5916f3b8da Fix #11454 Find and replace is broken
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-02 22:58:58 +10:00
Marc Delisle
02adcde835 Merge branch 'QA_4_5' 2015-08-31 07:02:05 -04:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-31 17:10:32 +10:00
Marc Delisle
0351229274 Merge branch 'QA_4_5' 2015-08-30 08:44:04 -04:00
Marc Delisle
993134cacd Missing column comments in table Structure
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-30 08:43:44 -04:00
Marc Delisle
f42f9021ae Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-28 16:23:55 -04:00
Marc Delisle
c76e7c8c46 Remove unused code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-27 15:13:58 -04:00
Atul Pratap Singh
d8d02fabc9 Remove not required lines
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-08-26 18:09:45 +05:30
Atul Pratap Singh
e00e257346 Remove not required lines
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-08-26 17:54:24 +05:30
Marc Delisle
bb01f9b2b7 Refactor db_info.inc.php
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-25 11:16:59 -04:00
Hugues Peccatte
17fb74d2cf Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-25 16:20:31 +02:00
Atul Pratap Singh
917add1528 Merge pull request #11370 from gzzhanghao/unittest
Recover test coverage
2015-08-25 13:30:44 +05:30
Madhura Jayaratne
dcb359ed2d Use maps only if the data has SRIDs
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 12:24:33 +10:00
Jason
d6577f5d1a Add tests for TableSearchController, TableStructureController.
- Also fix a missing include in operations.lib.php

Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-20 01:20:08 +08:00
Madhura Jayaratne
0368c52016 Allow using function that takes geometry data as the second parameter
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-18 11:26:21 +05:30
Madhura Jayaratne
768c9ba5e9 Fix more geometry function types in search
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-18 10:52:12 +05:30
Madhura Jayaratne
962fa4b73c Fix searching using unary geometry functions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-18 10:33:05 +05:30
Jason
fffcb7bc8b Add tests for TableStructureController and TableRelationController
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-18 02:35:18 +08:00
Jason
a121073c31 Add tests for DatabaseStructureController
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-17 01:31:14 +08:00
Madhura Jayaratne
e6756427e4 Add partition maintenance actions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-14 01:14:58 +05:30
Madhura Jayaratne
6c28a7020f Add partition table
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-14 00:07:39 +05:30
Madhura Jayaratne
7bb078f771 Fix some line breaks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:35:44 +05:30
Madhura Jayaratne
43f6e8b22a In fact this including replication.inc.php here is not required since it was include earlier
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:27:40 +05:30
Madhura Jayaratne
20102085ca Include replication.inc.php only if the database is in a slave replication process
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:11:39 +05:30
Madhura Jayaratne
b5a620777e Remove unnecessary line break
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-12 15:05:53 +05:30
Jason
0cfaa66032 Complete tests for TableIndexesController
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-12 16:50:09 +08:00
Jason
3613f2b6bd Introduce the ResponseStub
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-12 16:50:09 +08:00
Jason
59b11954f4 Recover tests for PMA_Table and rename sGetStatusInfo to getStatusInfo
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-12 16:48:40 +08:00
Jason
6d0d61e7f0 Recover some logic tests - TableSearchController
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-08-12 16:43:12 +08:00
Atul Pratap Singh
c0b6e18f5c Add missing includes and update member variables
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-08-12 09:41:54 +05:30
Madhura Jayaratne
5e937f4487 Add missing include
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-11 14:55:22 +05:30
Madhura Jayaratne
e959e349c0 Do not attach index table unnecessarily
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-11 12:50:44 +05:30
Madhura Jayaratne
7197a41f17 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-11 12:16:03 +05:30
Madhura Jayaratne
9701cbddc2 Fix spacing in doc comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-11 12:14:43 +05:30
Hugues Peccatte
3de772470a Use object instead of instantiating a new one.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-10 22:43:10 +02:00
Hugues Peccatte
82d7132774 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-10 22:41:11 +02:00
Hugues Peccatte
2f7aecc12a Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-10 21:27:51 +02:00
Madhura Jayaratne
bdce9e3ca6 Add missing include
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-10 21:26:16 +05:30
Madhura Jayaratne
52516b07e6 No longer used
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-10 16:36:31 +05:30
Madhura Jayaratne
edf833644b Merge branch 'master' into structureController
Conflicts:
	libraries/controllers/StructureController.class.php
2015-08-10 16:19:13 +05:30