Changed 'column_comments' to 'column_info'.
This commit is contained in:
@@ -5,11 +5,16 @@ phpMyAdmin - Changelog
|
|||||||
$Id$
|
$Id$
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
2003-02-24 Alexander M. Turek <rabus@users.sourceforge.net>
|
2003-02-25 Alexander M. Turek <rabus@users.sourceforge.net>
|
||||||
* lang/bulgarian-*.inc.php3, lang/czech-*.inc.php3, lang/dutch-*.inc.php3,
|
* lang/bulgarian-*.inc.php3, lang/czech-*.inc.php3, lang/dutch-*.inc.php3,
|
||||||
lang/swedish-*.inc.php3, lang/thai-*.inc.php3: Removed problematic %e from
|
lang/swedish-*.inc.php3, lang/thai-*.inc.php3: Removed problematic %e from
|
||||||
$datefmt (translations #692065).
|
$datefmt (translations #692065).
|
||||||
* lang/japanese-*.inc.php3: Fixed some inconsistences.
|
* lang/japanese-*.inc.php3: Fixed some inconsistences.
|
||||||
|
* config.inc.php3, db_details_importdocsql.php3, Documentation.html,
|
||||||
|
sql.php3, tbl_move_copy.php3, tbl_rename.php3,
|
||||||
|
libraries/config_import.lib.php3, libraries/relation.lib.php3,
|
||||||
|
libraries/transformations.lib.php3: Changed 'column_comments' to
|
||||||
|
'column_info'.
|
||||||
|
|
||||||
2003-02-25 Garvin Hicking <me@supergarv.de>
|
2003-02-25 Garvin Hicking <me@supergarv.de>
|
||||||
* tbl_properties.inc.php3: Fixed duped display of comments due to
|
* tbl_properties.inc.php3: Fixed duped display of comments due to
|
||||||
|
@@ -752,9 +752,10 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
|
|||||||
|
|
||||||
<dt>
|
<dt>
|
||||||
<a name="col_com"></a><br />
|
<a name="col_com"></a><br />
|
||||||
<b>$cfg['Servers'][$i]['column_comments']</b> string
|
<b>$cfg['Servers'][$i]['column_info']</b> string
|
||||||
</dt>
|
</dt>
|
||||||
<dd>
|
<dd>
|
||||||
|
<!-- This part requires a content update! -->
|
||||||
Since release 2.3.0 you can store comments to describe each column
|
Since release 2.3.0 you can store comments to describe each column
|
||||||
for each table. These will then be shown on the "printview".
|
for each table. These will then be shown on the "printview".
|
||||||
<br />
|
<br />
|
||||||
@@ -765,7 +766,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
|
|||||||
within this database create a table following this scheme:
|
within this database create a table following this scheme:
|
||||||
<br />
|
<br />
|
||||||
<tt>
|
<tt>
|
||||||
CREATE TABLE `PMA_column_comments` (<br />
|
CREATE TABLE `PMA_column_info` (<br />
|
||||||
id int(5) unsigned NOT NULL auto_increment,<br />
|
id int(5) unsigned NOT NULL auto_increment,<br />
|
||||||
db_name varchar(64) NOT NULL default '',<br />
|
db_name varchar(64) NOT NULL default '',<br />
|
||||||
table_name varchar(64) NOT NULL default '',<br />
|
table_name varchar(64) NOT NULL default '',<br />
|
||||||
@@ -778,7 +779,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
|
|||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
put the table name in
|
put the table name in
|
||||||
<tt>$cfg['Servers'][$i]['column_comments']</tt>
|
<tt>$cfg['Servers'][$i]['column_info']</tt>
|
||||||
</li>
|
</li>
|
||||||
</ul><br />
|
</ul><br />
|
||||||
</dd>
|
</dd>
|
||||||
|
@@ -92,8 +92,8 @@ $cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tab
|
|||||||
// schema - leave blank for no PDF schema support
|
// schema - leave blank for no PDF schema support
|
||||||
$cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf
|
$cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf
|
||||||
// - leave blank if you don't want to use this
|
// - leave blank if you don't want to use this
|
||||||
$cfg['Servers'][$i]['column_comments'] // table to store columncomments
|
$cfg['Servers'][$i]['column_info'] = ''; // table to store column information
|
||||||
= ''; // - leave blank if you don't want to use this
|
// - leave blank if you don't want to use this
|
||||||
$cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order, leave blank to not use
|
$cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order, leave blank to not use
|
||||||
= '';
|
= '';
|
||||||
$cfg['Servers'][$i]['AllowDeny']['rules'] // Host authentication rules, leave blank for defaults
|
$cfg['Servers'][$i]['AllowDeny']['rules'] // Host authentication rules, leave blank for defaults
|
||||||
@@ -119,7 +119,7 @@ $cfg['Servers'][$i]['relation'] = '';
|
|||||||
$cfg['Servers'][$i]['table_info'] = '';
|
$cfg['Servers'][$i]['table_info'] = '';
|
||||||
$cfg['Servers'][$i]['table_coords'] = '';
|
$cfg['Servers'][$i]['table_coords'] = '';
|
||||||
$cfg['Servers'][$i]['pdf_pages'] = '';
|
$cfg['Servers'][$i]['pdf_pages'] = '';
|
||||||
$cfg['Servers'][$i]['column_comments'] = '';
|
$cfg['Servers'][$i]['column_info'] = '';
|
||||||
$cfg['Servers'][$i]['AllowDeny']['order']
|
$cfg['Servers'][$i]['AllowDeny']['order']
|
||||||
= '';
|
= '';
|
||||||
$cfg['Servers'][$i]['AllowDeny']['rules']
|
$cfg['Servers'][$i]['AllowDeny']['rules']
|
||||||
@@ -144,7 +144,7 @@ $cfg['Servers'][$i]['relation'] = '';
|
|||||||
$cfg['Servers'][$i]['table_info'] = '';
|
$cfg['Servers'][$i]['table_info'] = '';
|
||||||
$cfg['Servers'][$i]['table_coords'] = '';
|
$cfg['Servers'][$i]['table_coords'] = '';
|
||||||
$cfg['Servers'][$i]['pdf_pages'] = '';
|
$cfg['Servers'][$i]['pdf_pages'] = '';
|
||||||
$cfg['Servers'][$i]['column_comments'] = '';
|
$cfg['Servers'][$i]['column_info'] = '';
|
||||||
$cfg['Servers'][$i]['AllowDeny']['order']
|
$cfg['Servers'][$i]['AllowDeny']['order']
|
||||||
= '';
|
= '';
|
||||||
$cfg['Servers'][$i]['AllowDeny']['rules']
|
$cfg['Servers'][$i]['AllowDeny']['rules']
|
||||||
|
@@ -48,7 +48,7 @@ if (isset($do) && $do == 'import') {
|
|||||||
//echo '<p>' . $line . '</p>';
|
//echo '<p>' . $line . '</p>';
|
||||||
$inf = explode('|',$line);
|
$inf = explode('|',$line);
|
||||||
if (!empty($inf[1]) && strlen(trim($inf[1])) > 0) {
|
if (!empty($inf[1]) && strlen(trim($inf[1])) > 0) {
|
||||||
$qry = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_comments'])
|
$qry = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_info'])
|
||||||
. ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ') '
|
. ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ') '
|
||||||
. ' VALUES('
|
. ' VALUES('
|
||||||
. '\'' . PMA_sqlAddslashes($db) . '\','
|
. '\'' . PMA_sqlAddslashes($db) . '\','
|
||||||
|
4
sql.php3
4
sql.php3
@@ -445,13 +445,13 @@ else {
|
|||||||
|
|
||||||
if ($cfgRelation['commwork']) {
|
if ($cfgRelation['commwork']) {
|
||||||
if (isset($table) && isset($db) && !empty($table) && !empty($db)) {
|
if (isset($table) && isset($db) && !empty($table) && !empty($db)) {
|
||||||
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_comments'])
|
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_info'])
|
||||||
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
|
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
|
||||||
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
|
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
|
||||||
$rmv_rs = PMA_query_as_cu($remove_query);
|
$rmv_rs = PMA_query_as_cu($remove_query);
|
||||||
unset($rmv_query);
|
unset($rmv_query);
|
||||||
} elseif (isset($db) && !empty($db)) {
|
} elseif (isset($db) && !empty($db)) {
|
||||||
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_comments'])
|
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_info'])
|
||||||
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
|
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
|
||||||
$rmv_rs = PMA_query_as_cu($remove_query);
|
$rmv_rs = PMA_query_as_cu($remove_query);
|
||||||
unset($rmv_query);
|
unset($rmv_query);
|
||||||
|
@@ -127,7 +127,7 @@ if (isset($new_name) && trim($new_name) != '') {
|
|||||||
|
|
||||||
// garvin: Move old entries from comments to new table
|
// garvin: Move old entries from comments to new table
|
||||||
if ($cfgRelation['commwork']) {
|
if ($cfgRelation['commwork']) {
|
||||||
$remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_comments'])
|
$remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info'])
|
||||||
. ' SET table_name = \'' . PMA_sqlAddslashes($new_name) . '\', '
|
. ' SET table_name = \'' . PMA_sqlAddslashes($new_name) . '\', '
|
||||||
. ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
|
. ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
|
||||||
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
|
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
|
||||||
@@ -145,7 +145,7 @@ if (isset($new_name) && trim($new_name) != '') {
|
|||||||
// Get all comments and MIME-Types for current table
|
// Get all comments and MIME-Types for current table
|
||||||
$comments_copy_query = 'SELECT
|
$comments_copy_query = 'SELECT
|
||||||
column_name, ' . PMA_backquote('comment') . '
|
column_name, ' . PMA_backquote('comment') . '
|
||||||
FROM ' . PMA_backquote($cfgRelation['column_comments']) . '
|
FROM ' . PMA_backquote($cfgRelation['column_info']) . '
|
||||||
WHERE
|
WHERE
|
||||||
db_name = \'' . PMA_sqlAddslashes($db) . '\' AND
|
db_name = \'' . PMA_sqlAddslashes($db) . '\' AND
|
||||||
table_name = \'' . PMA_sqlAddslashes($table) . '\'';
|
table_name = \'' . PMA_sqlAddslashes($table) . '\'';
|
||||||
|
@@ -46,7 +46,7 @@ if (isset($new_name) && trim($new_name) != '') {
|
|||||||
include('./libraries/relation.lib.php3');
|
include('./libraries/relation.lib.php3');
|
||||||
$cfgRelation = PMA_getRelationsParam();
|
$cfgRelation = PMA_getRelationsParam();
|
||||||
if ($cfgRelation['commwork']) {
|
if ($cfgRelation['commwork']) {
|
||||||
$remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_comments'])
|
$remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info'])
|
||||||
. ' SET table_name = \'' . PMA_sqlAddslashes($table) . '\''
|
. ' SET table_name = \'' . PMA_sqlAddslashes($table) . '\''
|
||||||
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
|
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
|
||||||
. ' AND table_name = \'' . PMA_sqlAddslashes($old_name) . '\'';
|
. ' AND table_name = \'' . PMA_sqlAddslashes($old_name) . '\'';
|
||||||
|
Reference in New Issue
Block a user