gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,321 Commits 12 Branches 481 Tags 2.4 GiB
aca7ccdd4c
Commit Graph

295 Commits

Author SHA1 Message Date
Michal Čihař
833cfec332 Avoid message concatenation in this case 2011-10-24 17:43:17 +02:00
Michal Čihař
6d1bd82939 Factor out error message formatting 2011-10-24 17:42:07 +02:00
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Rouslan Placella
dad70b66d9 Fixed broken retreival of triggers for a specific table 2011-09-17 15:54:27 +01:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Dieter Adriaenssens
9611e049c3 typos 2011-09-02 15:48:15 +02:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-08-24 21:40:52 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
710c7e2dd7 Print server_comment after server software version 2011-08-24 12:53:13 +02:00
Piotr Przybylski
f42b1d14dc PMA_DBI_fetch_single_row() shouldn't allow to set the $options argument 2011-08-24 12:12:04 +02:00
Piotr Przybylski
e7994a364e PMA_DBI_fetch_value() doesn't shouldn't allow to set the $options argument 2011-08-23 22:56:35 +02:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
da6c5b7129 Inline PMA_DBI_get_default_engine(), this one-liner is used only once 2011-08-23 22:19:21 +02:00
Piotr Przybylski
57bea0630a Use PMA_DBI_get_table_indexes_sql() only when really needed, in all other cases use PMA_DBI_get_table_indexes() 2011-08-23 22:14:15 +02:00
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Michal Čihař
2f9ca4de99 Merge branch 'edit-view' of git://github.com/csware/phpmyadmin into int 2011-08-08 09:44:19 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
024e164f02 Add doc 2011-08-05 15:14:39 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
a5ff5e860d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-08-05 01:18:56 +02:00
Piotr Przybylski
6fe137e68d PMA_DBI_get_columns - return null when there are no columns (server synchronize depends on this behavior) 2011-08-05 01:15:37 +02:00
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
 2011-08-04 20:19:43 +02:00
Michal Čihař
9fd0baaad2 Fix indentation 2011-08-04 15:38:13 +02:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Piotr Przybylski
95e90bbba4 Comments and formatting 2011-08-03 23:56:02 +02:00
Piotr Przybylski
997a5ea14c Comment change 2011-08-01 18:03:33 +02:00
Sven Strickroth
6ec8bb013b extend PMA_DBI_get_definition to support views 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-01 15:38:10 +02:00
Piotr Przybylski
b57fda5b3d Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 00:46:49 +02:00
Piotr Przybylski
e3b91b7a0b PMA_DBI_fetch_value, PMA_DBI_fetch_single_row and PMA_DBI_fetch_result don't need to cache affected rows because there are none 2011-07-31 00:44:42 +02:00
Piotr Przybylski
eb18aeeeb2 Remove debug code 2011-07-29 17:14:22 +02:00
Piotr Przybylski
abdf808dee Correctly detect drizzle extension 2011-07-28 22:46:19 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
 2011-07-21 15:25:52 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_status.php
 2011-07-20 18:23:21 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-07-14 22:38:20 +02:00
Piotr Przybylski
94b83dc3e9 Escape column name in PMA_DBI_get_columns_full 2011-07-14 21:31:45 +02:00
Piotr Przybylski
ab4cca24bc There are no triggers in Drizzle 2011-07-14 00:40:01 +02:00
Piotr Przybylski
beddd31ec3 Make PMA_DBI_getCompatibilities() aware of Drizzle - it doesn't have SQL_MODE 2011-07-13 17:00:42 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Rouslan Placella
1bbb2ea37e Merge branch 'master' into rte 2011-07-04 15:36:27 +01:00
Piotr Przybylski
0266ddd7bd Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-07-03 00:41:31 +02:00
Piotr Przybylski
e6b1d479cf Move PMA_DBI_get_column_values and PMA_DBI_get_table_indexes to server_synchronize.lib.php 
They are used only there, no need to parse 1,5 KB of code on every page load
 2011-07-02 00:45:08 +02:00
Piotr Przybylski
5021bae02f Remove unused PMA_DBI_get_table_data 2011-07-02 00:34:25 +02:00
Piotr Przybylski
d5dd8a2d37 Fix PMA_DBI_get_columns 2011-07-01 20:37:58 +02:00
Piotr Przybylski
e3a4f6d95a Fix PMA_DBI_get_columns when $column parameter is used and UNI key is promoted to PRI 2011-06-30 18:54:45 +02:00
Piotr Przybylski
29070219a9 Fix comments 2011-06-30 16:41:48 +02:00
Rouslan Placella
cf61fb1270 Prototype integration of Triggers editor. 2011-06-30 13:12:26 +01:00
Rouslan Placella
b4b56ed461 Merge branch 'master' into rte 
Conflicts:
	db_routines.php
	libraries/db_events.inc.php
	libraries/rte/rte_routines.lib.php
 2011-06-30 11:42:16 +01:00
Piotr Przybylski
7255ec2100 Change PMA_DBI_get_columns() to always return complex descriptions, never simple column list (it was needed for one case anyway) 
Bugfixes
 2011-06-30 00:48:19 +02:00
Piotr Przybylski
04fef01fd7 Properly compute 'Extra' in PMA_DBI_get_columns_sql (Drizzle) 2011-06-28 23:34:01 +02:00
Piotr Przybylski
96c5c6dbc6 Add $column parameter to PMA_DBI_get_columns 2011-06-28 23:11:58 +02:00
Piotr Przybylski
83117b18d7 Use PMA_sqlAddSlashes from recent merge 2011-06-27 23:59:04 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
6a422caf52 Proper escaping while checking for table (bug#3323066) 2011-06-27 14:46:04 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
3eaff6afb6 A few Drizzle-related changes to db operations tab 2011-06-26 18:38:36 +02:00
Piotr Przybylski
6553cdd663 Add information about query errors to debug output 2011-06-26 18:37:24 +02:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Michal Čihař
c6ec73963f Use PMA_sqlAddSlashes for database queries instead of addslashes. 
Should fix bug#3323066
 2011-06-21 17:41:47 +02:00
Rouslan Placella
61329e5c87 Merge branch 'master' into rte 2011-06-20 18:26:50 +01:00
Piotr Przybylski
3aaaf33afa Merge remote-tracking branch 'origin/master' into drizzle 2011-06-19 23:35:08 +02:00
Piotr Przybylski
18513b3e5d Fix comments 2011-06-19 23:34:02 +02:00
Piotr Przybylski
04dd50ac5d Properly escape names in PMA_isView 2011-06-19 23:34:01 +02:00
Piotr Przybylski
2e01d01b32 Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function 2011-06-18 00:15:43 +02:00
Piotr Przybylski
4273c602c8 Bugfix for new PMA_DBI_get_columns 2011-06-17 21:25:13 +02:00
Piotr Przybylski
30b85be0a2 Allow for null values in PMA_DBI_get_tables_full 2011-06-17 21:03:02 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Piotr Przybylski
f77886d1a0 Fix for I_S and D_D table data returned by PMA_DBI_get_tables_full 2011-06-08 00:37:31 +02:00
Rouslan Placella
0189a62776 Merge branch 'master' into rte 2011-06-06 17:18:35 +01:00
Piotr Przybylski
96f3b37fc1 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 16:42:04 +02:00
Michal Čihař
4603ca7001 Factor out common code for PMA_DBI_try_query. 
PMA_DBI_try_query is now shared for mysql and mysqli as the only
difference there was real call to the database, the rest was same
(timing, tracking, debugging,..).
 2011-06-06 14:03:13 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Rouslan Placella
35454870e5 Merge branch 'master' into rte 2011-06-04 20:26:11 +01:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset']. 
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
 2011-06-03 14:04:29 +02:00
Piotr Przybylski
33255a189c PMA_DBI_get_columns_full: works with Drizzle, uniform behavior with DisableIS true/false 2011-05-28 00:26:13 +02:00
Piotr Przybylski
9f59de6167 PMA_isSuperuser() and other privileges (Drizzle) 2011-05-27 20:18:00 +02:00
Piotr Przybylski
cafbefd518 PMA_DBI_get_columns - add "on update ..." to Extra when possible (Drizzle) 2011-05-25 19:43:44 +02:00
Piotr Przybylski
dd5324c05a Rewrite PMA_DBI_get_databases_full to work with Drizzle 
For Drizzle the only extended stat that works are SCHEMA_TABLES (always) and SCHEMA_TABLE_ROWS (only for InnoDB/innobase tables)
 2011-05-24 10:07:20 +02:00
Piotr Przybylski
539e8b26b3 Cast d_d.tables.auto_increment to NULL because currently (2011.03.13 GA) Drizzle doesn't provide correct value 2011-05-22 16:23:38 +02:00
Piotr Przybylski
3c9ef40d1e Add table alias in PMA_DBI_get_tables_full to avoid ambiguous field names in filtered queries (broken by join with TABLE_CACHE) 2011-05-22 15:03:30 +02:00
Piotr Przybylski
e69c721789 Try to get AVG_ROW_LENGTH from table cache 2011-05-22 14:25:51 +02:00
Piotr Przybylski
05c8dbee77 Try to get table size from table cache 2011-05-22 14:20:04 +02:00
Rouslan
aac4d59508 Support retreiving Triggers on a per-database basis. 2011-05-21 17:41:30 +01:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Piotr Przybylski
b9d37f27d2 Replace broken ANSI string concatenation with concat() function 2011-05-19 15:37:55 +02:00
Piotr Przybylski
4e090e1647 Read precision and scale for numeric columns, read enum definition for enums 2011-05-19 15:26:22 +02:00
Piotr Przybylski
ee72f556aa Code formatting 2011-05-19 15:08:55 +02:00
Piotr Przybylski
3c20076785 Make PMA_DBI_get_columns work with Drizzle 2011-05-18 22:19:26 +02:00
Piotr Przybylski
9c17051117 Remove deprecated function PMA_DBI_get_fields 2011-05-18 20:49:04 +02:00
Piotr Przybylski
4700907a5b Join with InnoDB stats only where InnoDB is provided by innobase library 
Fix notice
 2011-05-17 23:23:40 +02:00
Piotr Przybylski
b4bfa7f155 Use lowercase comparisons for Drizzle database names 2011-05-11 12:56:43 +02:00
Piotr Przybylski
423b45f6b2 PMA_DBI_get_tables_full - row counts for InnoDB tables in Drizzle 2011-05-09 19:46:35 +02:00
Piotr Przybylski
ddcc470320 Make PMA_DBI_get_tables_full work with Drizzle 2011-05-09 19:46:29 +02:00