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

258 Commits

Author SHA1 Message Date
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
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Piotr Przybylski
56476bc74d Make sure $limit is initialized 2011-05-03 14:26:55 +02:00
Piotr Przybylski
5c39c5511f Comments formatting and PHPDoc fixes 2011-05-02 20:50:16 +02:00
Piotr Przybylski
4c957837eb Introduce PMA_DRIZZLE constant 2011-04-06 15:40:58 +02:00
Piotr Przybylski
dcf0e4235a remove unused variable 2011-02-17 02:46:05 +01:00
Marc Delisle
45eb47fe14 Merge branch 'QA_3_3' 2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813 Bug #3153409 [core] 0 row(s) affected 2011-01-08 13:44:28 -05:00
Madhura Jayaratne
066b746bef patch #3150164 [structure] Ordering by size gives incorrect results 2011-01-03 08:10:49 -05:00
Marc Delisle
cfca67f422 Merge branch 'QA_3_3' 2011-01-03 08:03:41 -05:00
Madhura Jayaratne
55cd2fd898 patch #3150164 [structure] Ordering by size gives incorrect results 2011-01-03 08:02:28 -05:00
Michal Čihař
ae7a20607d Do not set charset for Drizzle. 2010-10-21 10:04:37 +02:00
Michal Čihař
2c7161c7a3 Remember also MySQL major version. 2010-10-21 10:04:15 +02:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3' 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
 2010-08-20 13:40:37 +02:00
Michal Čihař
41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3 
Conflicts:
	ChangeLog
	libraries/common.lib.php
 2010-08-20 13:36:49 +02:00
Michal Čihař
533e102135 Fix handling of unknown sort order. 2010-08-18 11:30:19 +02:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
Marc Delisle
887e2be664 fix merge conflicts 2010-08-01 06:20:10 -04:00
Marc Delisle
fd1d214d35 bug #3036132 [core] Triggers not fetched if dbname has an hyphen 2010-08-01 06:17:03 -04:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Michal Čihař
40388d4fe0 Simplify MySQL modules warnings by using standard functions. 2010-05-05 11:36:33 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
bd31cbb260 bug 2953050 export VIEW as SQL includes INSERT statement 2010-02-27 16:39:41 +00:00
Marc Delisle
760ac0cd98 bug 2953050 export VIEW as SQL includes INSERT statement 2010-02-27 16:39:41 +00:00
Marc Delisle
e5750aa98c bug #2959746 Unknown table status: TABLE_TYPE 2010-02-26 17:43:58 +00:00
Marc Delisle
ac649c64be bug #2959746 Unknown table status: TABLE_TYPE 2010-02-26 17:43:58 +00:00
Marc Delisle
0b7a3f716a bug 2941037 - Database structure not sorted by table correctly 2010-02-12 09:37:29 +00:00
Marc Delisle
0560e299a2 bug 2941037 - Database structure not sorted by table correctly 2010-02-12 09:37:29 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Herman van Rink
195165c2ae Code cleanup 2009-12-27 13:59:08 +00:00
Marc Delisle
cf67da28a1 bug #2887357 [core] Slow loading times with large databases (partial fix) 2009-11-08 11:33:28 +00:00