Commit Graph

325 Commits

Author SHA1 Message Date
Jo Michael
161a5a9321 Fix new checkstyle warnings 2012-04-29 03:16:11 +02:00
Jo Michael
fd6a96264a Fix some checkstyle FunctionDeclaration NotAtEnd warnings 2012-04-29 02:23:06 +02:00
Jo Michael
6839781e88 Fix checkstyle MultiLineAssignment warnings 2012-04-29 02:16:40 +02:00
Jo Michael
2466594cb7 Fix checkstyle ControlStructures warnings 2012-04-29 02:07:56 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Madhura Jayaratne
da0c3bbd13 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/Table.class.php
2012-04-25 23:53:12 +05:30
Madhura Jayaratne
d6e05d74b5 Various coding style fixes 2012-04-25 23:12:09 +05:30
Madhura Jayaratne
a817542fda Coding style improvements (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-25 22:27:32 +05:30
Marc Delisle
503e45aba5 Fix merge conflicts 2012-04-25 12:29:55 -04:00
Michal Čihař
c90388c5b3 Wrap some long lines 2012-04-25 13:26:31 +02:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Jo Michael
b5bca9ce0b Move columns in table columns editor 2012-04-09 19:02:13 +02:00
Rouslan Placella
350c86bac7 Merge branch 'QA_3_5'
Conflicts:
	po/fr.po
	po/pt_BR.po
2012-04-04 21:16:05 +01:00
Rouslan Placella
bfaef90018 Merge branch 'QA_3_4' into QA_3_5
Conflicts:
	po/fr.po
	po/pt_BR.po
2012-04-04 21:14:41 +01:00
Chanaka Indrajith Dharmarathna
ac82ba0f45 Fixed bug #3512565 - Missing word Rows in table list tooltip after click 2012-04-04 21:08:35 +01:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Michal Čihař
f89b2a3f32 Allow reordering of parameters 2012-03-14 14:47:12 +01:00
Onur Avsar
b916cdb4aa Added feature request 'clearing DEFAULT NULL' (rfe:3484063). 2012-03-05 15:07:09 -05:00
Marc Delisle
d5dede3530 Fix merge conflicts 2011-12-29 09:41:55 -05:00
Glenn
8697ec3d48 patch #3458944 copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' 2011-12-29 09:37:43 -05:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Madhura Jayaratne
7ac39c04c2 Merge branch 'QA_3_4'
Conflicts:
	libraries/Table.class.php
2011-12-07 08:53:13 +05:30
Madhura Jayaratne
6e0a10494f bug #3452506 [edit] Unable to move tables with triggers 2011-12-07 08:33:28 +05:30
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Marc Delisle
328defc9d9 bug [view] View renaming did not work 2011-10-10 07:25:52 -04:00
Marc Delisle
6fec80c614 bug [view] View renaming did not work 2011-10-10 07:16:30 -04:00
Aris Feryanto
036d1a8397 Correctly show error message when unable to save UI property 2011-08-29 15:00:06 +08: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
c12073871d Remove deprecated method PMA_Table::_isView() 2011-08-24 21:00:41 +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
41c18f6113 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/Table.class.php
	libraries/Tracker.class.php
2011-08-20 00:48:40 +02:00
Madhura Jayaratne
c28c33c471 Coding style improvements 2011-08-19 23:38:42 +05:30
Piotr Przybylski
0ca4a5f02e Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_search.php
	libraries/Table.class.php
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
	libraries/tbl_select.lib.php
	server_status.php
	tbl_change.php
2011-08-19 15:56:26 +02:00
Michal Čihař
cb9f7a2c26 Clarify code 2011-08-19 11:15:31 +02:00
Michal Čihař
a3f14bbd80 Fix indentation 2011-08-19 11:15:24 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
cc4743d396 'comment' is not a reserved keyword, remove PMA_backquote 2011-08-16 00:05:26 +02:00
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
7327dab936 Include link to docs 2011-08-15 10:01:10 +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
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Sven Strickroth
fcb4986598 there is no create_time-status for views
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-07 18:26:49 +05:30
Sven Strickroth
ed45a8e1f5 use i10n for error message
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-07 18:26:27 +05:30
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
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
590059cc30 Fix db/table name escaping in UI preferences 2011-07-14 01:30:25 +02:00
Piotr Przybylski
1bf994d73f Try to cast default values for BOOLEAN columns to TRUE/FALSE
Required for Drizzle, adds more correct values for MySQL
2011-07-09 22:08:32 +02:00
Piotr Przybylski
024d4adc27 UUID has no length 2011-07-09 21:52:33 +02:00
Piotr Przybylski
382c020a85 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-09 21:50:23 +02:00
Piotr Przybylski
2c4c45a68d SERIAL and BOOLEAN columns have no length 2011-07-09 21:49:07 +02:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/server_synchronize.lib.php
2011-07-06 18:31:38 +02:00
Piotr Przybylski
7ef98dc9a2 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-30 00:52:01 +02:00
Aris Feryanto
24150ce3a9 Merge remote-tracking branch 'origin/master' into aris 2011-06-29 10:28:00 +08:00
Piotr Przybylski
eb8caa4b77 Removed dead and incorrect code
(In static context $this makes no sense)
2011-06-28 22:42:04 +02:00
Piotr Przybylski
2a8dee495a Fix/unify comments 2011-06-28 22:42:04 +02:00
Piotr Przybylski
02fef2c5af Proper check for TIMESTAMP 2011-06-28 22:42:03 +02:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08: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ř
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
28ae930a71 sql_mode doesn't exist in Drizzle 2011-06-26 21:25:24 +02:00
Piotr Przybylski
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02:00
Piotr Przybylski
3c55511e5c Use Create_time instead of CREATE_TIME 2011-06-26 18:28:35 +02:00
Aris Feryanto
66cb04ead5 Add new feature: show/hide column(s) while browsing a table 2011-06-24 18:18:43 +08: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
Aris Feryanto
24a257ffce Column reordering: add checking for different server 2011-06-21 12:25:31 +07: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
30b85be0a2 Allow for null values in PMA_DBI_get_tables_full 2011-06-17 21:03:02 +02:00
Piotr Przybylski
17f8e16141 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	server_processlist.php
2011-06-15 15:38:04 +02:00
Aris Feryanto
4d27d21e80 No reorder column for table with only 1 column 2011-06-13 13:46:18 +07:00
Aris Feryanto
cf64d5282b Remember column order only in 'Browse' tab 2011-06-13 12:08:17 +07:00
Aris Feryanto
0b933d2614 Fix more bug: Reordering not work correctly if table structure changed 2011-06-09 14:43:34 +07:00
Aris Feryanto
803b4639bd Fix bug: Remember sorting and Column reordering not work correctly if table structure changed 2011-06-09 13:04:41 +07:00
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Piotr Przybylski
7d3cd879a4 Enable exact row counts for views in I_S and D_D. They map to in-memory data, so this shouldn't pose a performance problem 2011-05-18 11:51:08 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04: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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +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ř
5c2a111011 Fix format strings. 2010-05-05 11:44:55 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Michal Čihař
968f1f9d2d Merge branch 'QA_3_3' 2010-03-30 13:27:16 +02:00
Michal Čihař
a78fc12048 This method should be public. 2010-03-30 13:27:06 +02:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
87dd6b3cee Merge branch 'QA_3_3' 2010-03-12 17:16:58 -05:00
Dieter Adriaenssens
7c818d046a patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
3e02de8e6e notice: undefined index 2010-02-26 17:49:54 +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
Michal Čihař
c33ffe8138 rfe #1778337 [core] Try moving tables by RENAME and fail to CREATE/INSERT if that fails. 2010-01-21 11:22:52 +00:00
Marc Delisle
6f9d95970b rfe #2890226 [view] enable VIEW rename 2010-01-02 13:34:47 +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
Marc Delisle
9c35a4f947 bug #2894015 - typo 2009-11-08 10:35:00 +00:00
Marc Delisle
089be818a3 typo in comment 2009-10-23 10:15:25 +00:00
Marc Delisle
1419fcf3c2 remove deprecated parameter of PMA_Table::countRecords() 2009-10-23 10:02:09 +00:00
Marc Delisle
e9a1687a75 bug #2868328 [relations] Adding foreign key when table name contains a dot 2009-10-17 12:58:05 +00:00
Marc Delisle
e67f4cbc54 clarify function name 2009-06-24 11:34:56 +00:00
Herman van Rink
b5d14acc0e bug #2787162 [interface] Table with name log_views is incorrectly displayed as a view 2009-05-06 08:29:26 +00:00
Marc Delisle
662116f2fc bug #2491017 [operations] ANSI mode not supported (db rename and table move) 2009-03-01 13:05:35 +00:00
Marc Delisle
da6a269834 bug #2468354, SHOW TABLES throws a notice 2008-12-28 13:35:47 +00:00
Marc Delisle
c6bd88d51a avoid the notice (introduced in revision 12119) when creating a table 2008-12-14 13:09:39 +00:00
Sebastian Mendel
d650f5b74f use PMA_DBI_get_tables_full() for retrieving table information (retrieves information from SHOW and I_S) 2008-12-10 09:20:51 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
023c4442e0 bug #2100624 Wrong reference to old message strViewMaxExactCount 2008-09-08 17:10:58 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Marc Delisle
e4f84a9bbb PMA_getTableDef() is also called from Table.class.php 2008-06-27 14:27:18 +00:00
Marc Delisle
80b7f58ca2 sometimes we cannot rely on the cached information about a table 2008-05-31 13:34:16 +00:00
Marc Delisle
2dc280458f non-quoted list of columns in relation view for internal relations 2008-05-23 12:19:20 +00:00
Marc Delisle
a727fb367d relation view: foreign key changes for options ON DELETE/ON UPDATE on existing relations did not work in trunk 2008-05-11 12:38:26 +00:00
Sebastian Mendel
3a228111ae use already retrieved table info 2008-05-09 14:39:58 +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
Sebastian Mendel
1536decef8 no need to check for VIEW if we already know 2008-05-08 05:36:57 +00:00
Sebastian Mendel
206f4add2f refactored complete table/column creation altering;
register_globals independent;
fixed bug #1344768 [database] create/alter table new field can not have empty string as default;
tweaked form layout to save space;
2008-05-07 12:35:00 +00:00
Sebastian Mendel
f35c4ce7cc DEFAULT can also be empty string 2008-05-06 14:06:39 +00:00
Marc Delisle
728e553098 bug #1908719 [interface] New field cannot be auto-increment and primary key 2008-04-24 17:05:50 +00:00
Marc Delisle
c0efdb2e9d bug #1812763 [Copy] Table copy when server is in ANSI_QUOTES sql_mode 2008-03-21 14:38:14 +00:00
Marc Delisle
128219bf92 comment about work in progress for loadStructure 2008-03-16 12:06:48 +00:00
Sebastian Mendel
b0e3a115be revised table relation code 2007-12-19 16:10:23 +00:00
Sebastian Mendel
d7ecf570dc replaced NULL/NOT NULL selectbox with checkbox (preserver space) 2007-12-14 11:39:46 +00:00
Marc Delisle
1d343b4813 bug #1831646 [table creation] Error in CREATE TABLE with multiple primary keys and AUTO_INCREMENT 2007-11-14 18:42:47 +00:00
Sebastian Mendel
68cad9ad8b bug #1814733 win: copy db to mixed name db fails
make use of PMA_Message
do not just exit (blank white page) in case of error when copying/moving tables
2007-10-17 07:38:31 +00:00
Sebastian Mendel
585f991656 make use of PMA_Message 2007-10-16 09:30:13 +00:00
Sebastian Mendel
7955d51f4f removed MySQL < 5 code 2007-10-02 11:18:29 +00:00
Marc Delisle
5262517b35 bug #1764195 [views] DROP button does not work on defective views 2007-09-27 16:56:09 +00:00
Marc Delisle
3d74bf27a7 bug #1764735 [core] Designer: PDF error when deleting a table 2007-09-26 16:51:27 +00:00
Marc Delisle
76b0a1a915 bug #1798841 [relations] Copying db does not copy internal relations 2007-09-23 14:02:19 +00:00
Marc Delisle
0bf6ccee1d fix E_STRICT error when copying a db 2007-09-10 16:56:28 +00:00
Marc Delisle
10c118d276 E_STRICT when changing a column comment 2007-09-06 15:43:24 +00:00
Sebastian Mendel
36cab2b1f3 fixed strict notice 2007-09-04 12:01:55 +00:00
Sebastian Mendel
d2b9013fad fixed E_STRICT 2007-08-02 11:40:16 +00:00
Marc Delisle
4ad521e8df bug #1721002 db rename -> undefined cfgRelation 2007-05-17 21:57:15 +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
b2f3ae5fcf make $sql_query persistent (init it, never unset it, always assume it is set) 2007-04-01 09:26:14 +00:00
Sebastian Mendel
fe892e763e PMA_Table::isView(): check context before using $this 2007-03-22 09:36:50 +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
be23ee35d1 bug #1674914 [structure] changing definition of a TIMESTAMP field 2007-03-08 18:14:37 +00:00
Marc Delisle
81d5e79425 workaround for slow INFORMATION_SCHEMA queries about views 2007-01-21 13:13:42 +00:00
Marc Delisle
252ef1b15a RFE #1548637, option to not display record counts for views 2006-12-31 17:15:56 +00:00
Marc Delisle
7117f46357 problem changing a TIMESTAMP to DEFAULT 0 2006-12-12 13:12:42 +00:00
Marc Delisle
6e7eba3d5b bug #1567316, renaming a db containing a view 2006-10-18 13:03:57 +00:00
Marc Delisle
3cd881c9e3 export nothing if no tables are selected 2006-10-17 17:10:40 +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
45b04ab15d replaced $dblist with new PMA_List_Database class 2006-09-20 11:15:56 +00:00
Marc Delisle
1389e967d0 a few notes about RENAME 2006-08-05 11:30:41 +00:00
Marc Delisle
e79079b0c4 bug 1388048, constraints copied too early when copying a db 2006-07-04 16:46:09 +00:00
Marc Delisle
029a63a1f5 single-table copy did not copy the constraints 2006-07-04 15:53:41 +00:00
Marc Delisle
58f1a2875c typo disabled table copy operation 2006-06-20 16:42:41 +00:00
Michal Čihař
0f7e8e9e7d Add todo translations (bug #1436564). 2006-05-30 14:58:40 +00:00
Marc Delisle
5b8668f181 bug #1475949, removing the default value 2006-05-15 17:23:15 +00:00
Michal Čihař
04e666ff7c Adapt to changes in export. 2006-04-26 17:00:46 +00:00
Sebastian Mendel
0a9c4fc3eb never rush a checkin - its allways trouble 2006-04-11 15:13:22 +00:00
Sebastian Mendel
44a0f36096 use PMA_getenv() 2006-04-11 14:33:17 +00:00
Marc Delisle
eb387f69d4 bug #1458245 copy a db containing a VIEW 2006-03-28 11:37:55 +00:00
Marc Delisle
f5bbe5f24d DROP VIEW choice also for a db copy operation 2006-03-25 11:45:23 +00:00
Marc Delisle
f2d706b637 bug #1439002, drop basetable of a view gives error on overview 2006-03-21 18:07:43 +00:00
Sebastian Mendel
ecc793bf83 make use of PMA_Table object for renaming tables (added also some required functionality to PMA_Table class) 2006-02-21 18:25:57 +00:00
Sebastian Mendel
b5a19a0b83 minor fixes and improvements, formating, documentation 2006-02-21 13:17:40 +00:00
Sebastian Mendel
f341c72fbe merged libraries\tbl_move_copy.php in class PMA_Table 2006-02-21 11:34:19 +00:00
Sebastian Mendel
cd340d8496 moved PMA_generateFieldSpec(), PMA_tableIsView(), PMA_countRecords(), PMA_generateAlterTable() into class PMA_Table 2006-02-21 11:07:46 +00:00
Sebastian Mendel
71a69a0263 *NEW* 2006-02-21 10:12:46 +00:00