diff --git a/ChangeLog b/ChangeLog index 631cace69..9328ff7ea 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ $Source$ * libraries/display_tbl.lib.php3, changed a variable name for better doc. * tbl_properties.php3, lang/*, Documentation.html: - new feature: Relational integrity + new feature: Referential integrity 2002-03-26 Loďc Chapeaux * libraries/common.lib.php3, lines 146-152, 519-524 & 567: fixed bug diff --git a/Documentation.html b/Documentation.html index fe1861f35..05ef50ba1 100755 --- a/Documentation.html +++ b/Documentation.html @@ -163,7 +163,8 @@
  • create (*) and read dumps of tables
  • export (*) and import data to CSV values
  • administer multiple servers and single databases
    • -
  • communicate in more than 20 different languages
    • +
  • check referential integrity
    • +
  • communicate in more than 38 different languages
    • @@ -570,8 +571,15 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
    Since release 2.2.4 you can describe, in a special 'relation' table, which field is a key in another table (a foreign key). phpMyAdmin currently uses - this to make clickable, when you browse the src table, the data values - that point to the dest table. + this to +

    The keys can be numeric or character. diff --git a/lang/arabic.inc.php3 b/lang/arabic.inc.php3 index 6a280228c..dfe43cb5a 100644 --- a/lang/arabic.inc.php3 +++ b/lang/arabic.inc.php3 @@ -352,5 +352,5 @@ $strSelectADb = 'Please select a database'; $strSelectAll = 'Select All'; //to translate $strUnselectAll = 'Unselect All'; //to translate $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index f5dea2ebc..b001206d8 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -1,2 +1,2 @@ -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/bulgarian-koi8.inc.php3 b/lang/bulgarian-koi8.inc.php3 index 1cae9f08f..eb44d42f1 100644 --- a/lang/bulgarian-koi8.inc.php3 +++ b/lang/bulgarian-koi8.inc.php3 @@ -348,5 +348,5 @@ $strZip = '"zip- $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index f20b057e4..3051ca8e6 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -348,5 +348,5 @@ $strZip = '"zip- $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index 19e7af79f..7a15f7950 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -347,5 +347,5 @@ $strYes = 'Si'; $strZip = '"comprimit amb zip"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index bfa0103a6..1cb4bf2f1 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -350,5 +350,5 @@ $strYes = ' $strZip = '"zipped"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 8509ff0fb..d8deb8130 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -353,5 +353,5 @@ $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index b8fcecd36..b2fa32a44 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -348,5 +348,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 796223984..40fa80f07 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -348,5 +348,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 08a1349da..9740a4838 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -347,5 +347,5 @@ $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index e7dbee3af..396ba5d0e 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -348,5 +348,5 @@ $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 583a461c7..378db7d64 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -242,7 +242,7 @@ $strQBEIns = 'Ins'; $strQueryOnDb = 'SQL-query on database %s:'; $strRecords = 'Records'; -$strRelationalIntegrity = 'Check relational integrity:'; +$strReferentialIntegrity = 'Check referential integrity:'; $strReloadFailed = 'MySQL reload failed.'; $strReloadMySQL = 'Reload MySQL'; $strRememberReload = 'Remember reload the server.'; diff --git a/lang/estonian.inc.php3 b/lang/estonian.inc.php3 index 515d759c3..87d84be19 100644 --- a/lang/estonian.inc.php3 +++ b/lang/estonian.inc.php3 @@ -347,5 +347,5 @@ $strYes = 'Jah'; $strZip = '"zipitud"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3 index 83dd993b1..03a5dbfae 100644 --- a/lang/finnish.inc.php3 +++ b/lang/finnish.inc.php3 @@ -351,5 +351,5 @@ $strYes = 'Kyll $strZip = '"zip-pakattu"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index e17a933c2..6569c1609 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -242,7 +242,6 @@ $strQBEIns = 'Ajouter'; $strQueryOnDb = 'Requęte SQL sur la base %s :'; $strRecords = 'Enregistrements'; -$strRelationalIntegrity = 'Vérifier l\'intégrité relationnelle'; $strReloadFailed = 'MySQL n\'a pu ętre rechargé.'; $strReloadMySQL = 'Recharger MySQL'; $strRememberReload = 'N\'oubliez pas de recharger MySQL'; @@ -347,4 +346,5 @@ $strYes = 'Oui'; $strZip = '"zippé"'; +$strReferentialIntegrity = 'Vérifier l\'intégrité référentielle'; ?> diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3 index 3e8d36272..32b5cf1c5 100644 --- a/lang/galician.inc.php3 +++ b/lang/galician.inc.php3 @@ -351,5 +351,5 @@ $strCardinality = 'Cardinality'; $strLogin = 'Login'; $strLogPassword = 'Password:'; $strLogUsername = 'Username:'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index 407699a3c..1bcfde615 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -347,5 +347,5 @@ $strYes = 'Ja'; $strZip = '"Zip komprimiert"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3 index a8c337e52..287e50642 100644 --- a/lang/greek.inc.php3 +++ b/lang/greek.inc.php3 @@ -349,5 +349,5 @@ $strNoIndexPartsDefined = 'No index parts defined!'; $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/hebrew.inc.php3 b/lang/hebrew.inc.php3 index 73ffd20e2..d2897e9a9 100644 --- a/lang/hebrew.inc.php3 +++ b/lang/hebrew.inc.php3 @@ -347,5 +347,5 @@ $strZip = '"Zipped"'; // To translate $strChangePassword = 'Change password'; $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/hungarian.inc.php3 b/lang/hungarian.inc.php3 index f3de7155a..b6f5753d8 100644 --- a/lang/hungarian.inc.php3 +++ b/lang/hungarian.inc.php3 @@ -348,5 +348,5 @@ $strYes = 'Igen'; $strZip = '"zippel tömörítve"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 02eb966ce..5006af8d7 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -351,5 +351,5 @@ $strZip = '"compresso con zip"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 5f7f0fc95..f603de535 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -352,5 +352,5 @@ $strXkana = ' // To translate $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index e0e04ced9..6cd128529 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -352,5 +352,5 @@ $strXkana = ' // To translate $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index f91df5b75..c09a749e0 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -352,5 +352,5 @@ $strNoIndexPartsDefined = 'No index parts defined!'; $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/latvian.inc.php3 b/lang/latvian.inc.php3 index 2e293d694..e64415ed9 100644 --- a/lang/latvian.inc.php3 +++ b/lang/latvian.inc.php3 @@ -351,5 +351,5 @@ $strYes = 'J $strZip = 'arhivçts ar zip'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index 11c8d729d..f8702cc92 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -346,5 +346,5 @@ $strYes = 'Ja'; $strZip = '"komprimert (zip)"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index ff071d783..963616bc6 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -347,5 +347,5 @@ $strYes = 'Tak'; $strZip = '".zip"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index fd8f52a78..d2486d877 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -347,5 +347,5 @@ $strBzip = '"bzipped"'; //to translate $strGzip = '"gzipped"'; //to translate $strHomepageSourceforge = 'Sourceforge phpMyAdmin Download Page'; //to translate $strZip = '"zipped"'; //to translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3 index 83eebd312..372270dd0 100644 --- a/lang/romanian.inc.php3 +++ b/lang/romanian.inc.php3 @@ -348,5 +348,5 @@ $strZip = '"zipped"'; // To translate $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index c44476d16..29529b907 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -347,5 +347,5 @@ $strZip = ' $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index 44bb8fd65..bfa1ad9f0 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -347,5 +347,5 @@ $strYes = ' $strZip = 'óďŕęîâŕňü â "zip"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index fe29d00a5..173d03fad 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -350,5 +350,5 @@ $strZip = '"zo zipovan // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/slovak-win1250.inc.php3 b/lang/slovak-win1250.inc.php3 index 0d5beacd5..c04b21690 100644 --- a/lang/slovak-win1250.inc.php3 +++ b/lang/slovak-win1250.inc.php3 @@ -347,5 +347,5 @@ $strZip = '"zozipovan $strChangePassword = 'Change password'; $strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate $strPmaUriError = 'The $cfgPmaAbsoluteUri directive MUST be set in your configuration file!'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 47fb878b3..4ace04f4e 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -345,5 +345,5 @@ $strZip = '"comprimido con zip"'; // To translate $strFlushTable = 'Flush the table ("FLUSH")';//to translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index bfec0e121..35f6db4ac 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -347,5 +347,5 @@ $strYes = 'Ja'; $strZip = '"zippad"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index ad75ec268..bf5b142db 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -353,5 +353,5 @@ $strNoIndexPartsDefined = 'No index parts defined!'; $strNoIndex = 'No index defined!'; $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/turkish.inc.php3 b/lang/turkish.inc.php3 index ba57d4912..b4b99460f 100644 --- a/lang/turkish.inc.php3 +++ b/lang/turkish.inc.php3 @@ -347,5 +347,5 @@ $strYes = 'Evet'; $strZip = '"ziplenmiţ"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/lang/ukrainian-win1251.inc.php3 b/lang/ukrainian-win1251.inc.php3 index c6e8419d3..67d63054b 100644 --- a/lang/ukrainian-win1251.inc.php3 +++ b/lang/ukrainian-win1251.inc.php3 @@ -347,5 +347,5 @@ $strYes = ' $strZip = 'çŕďŕęóâŕňč â "zip"'; // To translate -$strRelationalIntegrity = 'Check relational integrity:'; //to translate +$strReferentialIntegrity = 'Check referential integrity:'; //to translate ?> diff --git a/tbl_properties.php3 b/tbl_properties.php3 index c737cee75..070801096 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -1209,7 +1209,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32306 echo "\n"; } // end 3.23.06 < MySQL < 3.23.22 -// Relational integrity check +// Referential integrity check if (!empty($cfgServer['relation'])) { $local_query = 'SELECT src_column, dest_table, dest_column' @@ -1219,8 +1219,8 @@ if (!empty($cfgServer['relation'])) { $result = @mysql_query($local_query); if ($result != FALSE && mysql_num_rows($result) > 0) { - echo " \n"; - echo "
  • " . $strRelationalIntegrity . "
    \n"; + echo " \n"; + echo "
  • " . $strReferentialIntegrity . "
    \n"; while ($rel = mysql_fetch_row($result)) { echo '