Commit Graph

279 Commits

Author SHA1 Message Date
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
Herman van Rink
0ad129ef05 bug #2872247 [interface] Failed opening required mysql_charsets.lib.php, thanks to CyberLeo Kitsana - cyberleo 2009-10-03 19:25:26 +00:00
Marc Delisle
2227f1c4c3 bug #2852370 [operations] Renaming database deletes triggers 2009-09-27 13:23:07 +00:00
Marc Delisle
c34ab9ed37 bug #2832600 [export] Slow export when having lots of databases 2009-09-20 12:21:30 +00:00
Michal Čihař
215b8fa174 Added ability for synchronizing databases among servers.
Manual merge from branches/gsoc/zahra.
2009-08-24 14:39:38 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Herman van Rink
adca3098ab bug #2787162 [interface] Table with name log_views is incorrectly displayed as a view 2009-05-06 08:30:27 +00:00
Alexander M. Turek
69b98b42e2 Bug #2565948 2009-02-09 15:25:54 +00:00
Marc Delisle
f37a935203 bug #2568054 for numeric db name 2009-02-08 13:31:58 +00:00
Marc Delisle
da6a269834 bug #2468354, SHOW TABLES throws a notice 2008-12-28 13:35:47 +00:00
Marc Delisle
197434c7b1 notice from array_diff() that argument #2 is not an array 2008-12-25 13:56:38 +00:00
Marc Delisle
ec4549f994 patch #2356575 [display] Sortable database columns 2008-12-15 17:27:43 +00:00
Sebastian Mendel
4c3f3a068f do not overwrite already cached table infos 2008-12-10 09:18:14 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Marc Delisle
64623fe9db [security] Code execution vulnerability 2008-09-15 12:03:45 +00:00
Marc Delisle
1bd7ec70e2 bug #2046883 [core] Notices about deprecated dl() (so stop using it) 2008-08-16 14:06:27 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Sebastian Mendel
df216c95ec cache table information 2008-05-09 13:38:03 +00:00
Sebastian Mendel
fa21fe3ea5 make the database list more magic:
load/fetch only if really required
use SPL ArrayObject to behave like an array
2008-05-09 10:41:16 +00:00
Marc Delisle
4d4ec9ccc9 change querying of triggers in conformity with the example in MySQL manual 2008-04-26 15:18:12 +00:00
Marc Delisle
4bb9cdf1b3 PMA_DBI_get_definition() 2008-02-26 13:17:22 +00:00
Marc Delisle
2ffa06dfd6 [gui] Events management: minimal support on db structure page 2008-02-25 22:10:53 +00:00
Sebastian Mendel
801249f3a5 use function for caching 2008-01-22 07:29:08 +00:00
Sebastian Mendel
f33ea1151e oops, of course cache per server 2008-01-21 14:40:32 +00:00
Sebastian Mendel
67b6618439 cache is_superuser info 2008-01-21 12:14:00 +00:00
Sebastian Mendel
6174b881c5 cache MySQL version info 2008-01-21 11:19:21 +00:00
Sebastian Mendel
bd501a302b removed obsolete PMA_ENGINE_KEYWORD 2008-01-21 11:07:16 +00:00
Sebastian Mendel
e3672d6a5f removed use charset_connection 2008-01-21 10:05:36 +00:00
Marc Delisle
ec408de34d bug #1821264 [display] MaxTableList and INFORMATION_SCHEMA 2007-12-27 23:50:45 +00:00
Sebastian Mendel
7b97eaa6f0 added missing examples and some functionality 2007-12-19 15:22:36 +00:00
Marc Delisle
a4dfad8912 bug #1848889 [export] export trigger should use DROP TRIGGER IF EXISTS 2007-12-14 17:48:39 +00:00
Sebastian Mendel
b1939a554a apply limit for max db/tale listed to SHOW also;
raised minimum MySQL version in case of error to 5.0.15;
there is only utf8 in PMA 3;
2007-12-13 14:57:25 +00:00
Sebastian Mendel
560c6d4f6f config option to disable use of information_schema (if ok backport to QA_2_11) 2007-12-13 10:07:01 +00:00
Marc Delisle
c7ba1bb032 bug #1832285 mysql DBI does not handle when control user connection fails 2007-12-09 13:06:21 +00:00
Sebastian Mendel
5dd96d42ce replaced $PMA_errors with new PMA_Error_Handler 2007-10-08 16:02:58 +00:00
Marc Delisle
142154b4a8 undefined variable when creating a table that exists 2007-10-06 20:03:52 +00:00
Sebastian Mendel
0e8334a41b removed MySQL < 5 code 2007-10-02 09:05:49 +00:00
Marc Delisle
3e460af6cf remove non-UTF-8 2007-09-04 16:59:39 +00:00
Marc Delisle
09b1ea0646 Navigator for the table list in the content panel 2007-06-25 14:00:35 +00:00
Sebastian Mendel
d05620c643 add only slashes where required 2007-05-18 07:03:44 +00:00
Sebastian Mendel
573a6161bd fixed code indention 2007-05-09 12:18:57 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
adb39168cc coding standard: no braces around include 2007-04-01 09:51:41 +00:00
Marc Delisle
01f16dc6e5 patch #1681620 [interface] support reordering of ['ColumnTypes'] 2007-03-23 16:52:32 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Marc Delisle
76eda3dd55 bug #1596328 [export] drop support for POSTGRESQL compatibility mode 2007-03-15 20:35:47 +00:00
Sebastian Mendel
81690240fc bug #1616486 server_databases does not show all databases 2007-02-12 15:19:43 +00:00
Marc Delisle
42ac66ad74 get rid of propicon 2007-02-10 15:58:46 +00:00
Michal Čihař
99da0295ea Fix typos (bug #1597137). 2006-11-19 20:54:19 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Marc Delisle
6455e65bc9 wrong parameter when calling error.php 2006-10-19 20:48:14 +00:00
Marc Delisle
9ef2fade2a bug #1568341, last part of the fix 2006-10-06 17:04:43 +00:00
Marc Delisle
530a41aed3 bug #1568341, case sensitivity in db names 2006-10-01 18:55:52 +00:00
Marc Delisle
066664959e bug #1566904, typo 2006-09-29 13:06:45 +00:00
Sebastian Mendel
1eadc0a41a use @todo tag for todo items, to show up in generated documentation 2006-09-21 14:28:46 +00:00
Sebastian Mendel
3b526ced4f added error reporting if dblist retrieval from information_schema fails 2006-09-20 14:58:41 +00:00
Sebastian Mendel
45b04ab15d replaced $dblist with new PMA_List_Database class 2006-09-20 11:15:56 +00:00
Marc Delisle
f92275d136 workaround information_schema problem when a db directory has wrong permissions or ownership 2006-06-25 12:42:25 +00:00
Marc Delisle
d7ddb66176 continue support for PROCEDURE and FUNCTION 2006-06-22 19:59:30 +00:00
Marc Delisle
4e9745e1e7 start support for PROCEDURE and FUNCTIONS 2006-06-22 16:14:36 +00:00
Marc Delisle
6215a6d94a bug #1490193 and code simplification 2006-05-18 16:53:40 +00:00
Michal Čihař
9f8afc5d4e Reload language file after switch to utf-8 translation (bug #1442605). 2006-04-27 12:13:52 +00:00
Sebastian Mendel
951ea7cdfa disable table stats for MySQL 5 by default 2006-04-13 15:37:09 +00:00
Sebastian Mendel
5d084ddce8 fixed initial sort order 2006-04-13 13:58:58 +00:00
Sebastian Mendel
64941d2881 - extended PMA_DBI_get_databases_full() to allow limiting and sorting
- added new function PMA_DBI_get_databases_count()
2006-04-13 13:49:28 +00:00
Marc Delisle
4d359e7e2f bug #1444892, TYPE deprecated in MySQL 5.1 2006-03-08 18:07:55 +00:00
Sebastian Mendel
5caf0445e6 added workaround for bug #1436171 Cannot display Capitalised Databases 2006-02-22 14:46:35 +00:00
Michal Čihař
30bbf58924 Improve compatibility modes function, thanks to Sebastian. 2006-02-22 11:49:44 +00:00
Michal Čihař
7ad31e219c New function for getting available SQL compatibility modes. 2006-02-22 10:14:43 +00:00
Michal Čihař
c69bebb25b Compatibility with iconv charset names on AIX (patch #1420704, thanks to Bj��rn Wiberg - bwiberg). 2006-02-21 18:14:44 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Sebastian Mendel
60b69f7159 fixed bug: undefined index with empty database in db structure view 2006-01-17 09:31:17 +00:00
Sebastian Mendel
f298dca837 small fix to "PMA_DBI_get_tables_full() first parameter now also accepts an array of database names not only a single name" 2006-01-14 20:55:13 +00:00
Sebastian Mendel
e62ce1a6e2 PMA_DBI_get_tables_full() first parameter now also accepts an array of database names not only a single name 2006-01-14 17:56:18 +00:00
Marc Delisle
734a5ca6fc an assignment syntax does not work on PHP 5.1.2 2006-01-12 21:03:34 +00:00
Michal Čihař
fc270335cf Add support for hiding databases (RFE #1372865). 2005-12-16 13:21:00 +00:00
Sebastian Mendel
45a342b189 - forgot debug code
- correct result for non MySQL 5
2005-12-11 13:54:04 +00:00
Sebastian Mendel
76731a6eb8 fixed BC for PMA_DBI_get_fields() 2005-12-09 17:43:06 +00:00