Commit Graph

536 Commits

Author SHA1 Message Date
Spun Nakandala
3fabd7728f $_POST['fields'][...] variables renamed such that they better reflect their intended purpose 2013-06-13 11:31:29 +05:30
Spun Nakandala
ca8d81b95c PMA_isDropDatabase($sql_query) method added to sqlparser.lib.php 2013-06-12 22:05:24 +05:30
Spun Nakandala
e32064bcd2 code for displaying confirm page removed. 2013-06-12 19:54:44 +05:30
Spun Nakandala
9ef591e69e space added before elseif 2013-06-12 17:21:51 +05:30
Spun Nakandala
96bf1782d3 PMA_getHtmlForConfirmPage method added to sql.lib.php to create html for the confirm page. 2013-06-11 21:55:39 +05:30
Spun Nakandala
7f80aa2971 Avoided the use of global variables by directly accessing super global variables. 2013-06-11 20:42:07 +05:30
Dieter Adriaenssens
738caedafb RFE 1432, add table name to message 2013-06-04 17:18:21 +02:00
Dieter Adriaenssens
c6fd32f85d Merge branch 'QA_4_0'
Conflicts:
	sql.php
2013-06-04 10:54:04 +02:00
Dieter Adriaenssens
7a3c15724a fix bug #3966, only display 'table has no unique column' when table is defined 2013-06-04 10:45:53 +02:00
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI
Conflicts:
	libraries/database_interface.lib.php
2013-05-26 21:43:33 +05:30
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Marc Delisle
b8e4f346a5 Clarify function name 2013-05-26 11:34:43 -04:00
Atul Pratap Singh
8cd420ac94 Remove duplicate code, profiling scripts already included 2013-05-25 16:47:32 +05:30
Madhura Jayaratne
ce85ebd950 Merge branch 'master' into OOP_DBI 2013-05-24 19:06:45 +05:30
Marc Delisle
be31655c38 Fix merge conflicts 2013-05-24 08:59:13 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Atul Pratap Singh
c88762e386 Include profiling scripts initially, bug#3639 in QA_4_0 2013-05-23 23:54:29 +05:30
Madhura Jayaratne
f7d6517f0f Coding style fixes 2013-05-23 22:54:40 +05:30
Atul Pratap Singh
dbb0ed3e6a Include profiling scripts initially, bug#3639 2013-05-23 18:07:24 +05:30
Atul Pratap Singh
435dc9c74a left while fixing bug#3936 2013-05-17 10:42:45 +05:30
Brad Jorgensen
5ba39c172a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin.git into profiler3 2013-05-15 10:06:08 -05:00
Brad Jorgensen
4d79fabac3 implementation of feature request #1363 2013-05-15 09:54:18 -05:00
Marc Delisle
e28f3c064d Merge branch 'QA_4_0' 2013-05-14 12:19:58 -04:00
Marc Delisle
be4f24265b Fix typo 2013-05-14 12:19:20 -04:00
Marc Delisle
f8e90174a0 Merge pull request #375 from Chanaka/QA_4_0
Fixed #3902: Cannot browse when table name contains keyword 'call'
2013-05-14 09:18:21 -07:00
Marc Delisle
e1078c38ee Fix merge conflicts 2013-05-13 16:33:21 -04:00
Kasun Chathuranga
a24b4ae33a PMA_Table::analyzeStructure() method to centralize the analysis of the structure of a view/table 2013-05-13 23:11:30 +05:30
Chanaka Indrajith
3caafb302d Fixed #3902: Cannot browse when table name contains keyword 'call' 2013-05-12 22:54:23 +05:30
Kasun Chathuranga
839b1a606e Fix bug #3926 View is not updatable 2013-05-12 21:42:48 +05:30
Kasun Chathuranga
03fc9b9256 PMA_is_system_schema --> PMA_isSystemSchema 2013-05-12 08:51:54 +05:30
Michal Čihař
308ec40a8c Shorter name for a parameter 2013-05-10 10:28:24 +02:00
Michal Čihař
0c2832ca04 Consistent function naming in Kanji support module 2013-05-10 09:53:41 +02:00
Mohamed Ashraf
02efceb918 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into refactor 2013-05-08 19:36:42 +02:00
Mohamed Ashraf
02076ada31 Fixing errors 2013-05-08 18:59:49 +02:00
Mohamed Ashraf
9c63a2b5f3 Moved code that creates the profiling chart in to a method 2013-05-08 18:50:34 +02:00
Mohamed Ashraf
28a91c941d Moved code that creates the header for the print view in to method 2013-05-08 18:49:17 +02:00
Marc Delisle
5257ac476e Fix merge conflicts 2013-05-08 09:51:16 -04:00
Marc Delisle
0f766fc5f5 Fix merge conflicts 2013-05-08 09:46:46 -04:00
Jan Brejcha
60db2bdb9c Added spacing before "{". 2013-05-08 09:45:35 -04:00
Jan Brejcha
1bcb4a281b Changed coding style to the project coding style. 2013-05-08 09:45:25 -04:00
Jan Brejcha
64cb3de415 - Updated variable goto - set to empty string when the table is empty (line 330)
- When the result is empty, we want to show only message, that the result was empty. So when $goto is set to empty (see above) I will echo one space and exit. In other cases just show the set goto as before this change. (lines 995 to 1002)
2013-05-08 09:44:34 -04:00
Marc Delisle
f9766dc57b Fix merge conflicts 2013-05-07 12:59:24 -04:00
Michal Čihař
87f98e4d84 Fix function name 2013-05-06 15:24:34 +02:00
Kasun Chathuranga
53d7c5829b Fix more instances of naming style violations related to PMA_DBI functions 2013-05-05 21:06:57 +05:30
ibennetch
9b94f71974 Merge pull request #296 from scnakandala/Refactoring
Refactoring the SQL Executor and Table's Structure Manipulators
2013-05-04 07:45:15 -07:00
Spun Nakandala
d09597c86f libraries/sql.lib.php file added. Functions in the sql.php transfered into sql.lib.php 2013-05-03 00:04:51 +05:30
Michal Čihař
025e931586 Merge pull request #301 from m0hamed/fix_echo_in_sql_php
Fixed old echo statements to new addHTML way
2013-05-02 01:53:06 -07:00
Mohamed Ashraf
3fc89813af Added missing semi colons 2013-05-02 02:32:04 +02:00
Mohamed Ashraf
59adbac2de Fixed old echo statements to new addHTML way 2013-05-01 09:51:16 +02:00
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
2013-05-01 00:51:15 +05:30