From a66908567d24ce923158b782d1b83648ed11e778 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Sep 2002 13:00:25 +0000 Subject: [PATCH] for Loic --- ChangeLog | 3 +++ Documentation.html | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c0ed20c2..fde3a1416 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-09-05 Loïc Chapeaux + * Documentation.html: modify name of relations in FAQ 6.6 + 2002-09-04 Loïc Chapeaux * tbl_change.php3: protect with backquotes diff --git a/Documentation.html b/Documentation.html index 8c8f0a556..f08981962 100755 --- a/Documentation.html +++ b/Documentation.html @@ -2166,15 +2166,15 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' example tables:

-      CREATE TABLE countries (
+      CREATE TABLE REL_countries (
       country_code char(1) NOT NULL default '',
       description varchar(10) NOT NULL default '',
       PRIMARY KEY (country_code)
     ) TYPE=MyISAM;

-      INSERT INTO countries VALUES ('C', 'Canada');
+      INSERT INTO REL_countries VALUES ('C', 'Canada');

-      CREATE TABLE persons (
+      CREATE TABLE REL_persons (
       id tinyint(4) NOT NULL auto_increment,
       person_name varchar(32) NOT NULL default '',
       town_code varchar(5) default '0',
@@ -2182,20 +2182,22 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'        PRIMARY KEY (id)
     ) TYPE=MyISAM;

-      INSERT INTO persons VALUES (11, 'Marc', 'S', '');
-      INSERT INTO persons VALUES (15, 'Paul', 'S', 'C');
+      INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');
+      INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');

-      CREATE TABLE towns (
+      CREATE TABLE REL_towns (
       town_code varchar(5) NOT NULL default '0',
       description varchar(30) NOT NULL default '',
       PRIMARY KEY (town_code)
     ) TYPE=MyISAM;

-      INSERT INTO towns VALUES ('S', 'Sherbrooke');
-      INSERT INTO towns VALUES ('M', 'Montréal');
+      INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');
+      INSERT INTO REL_towns VALUES ('M', 'Montréal');

-      INSERT INTO `PMA_relation` VALUES ('mydb', 'persons', 'town_code', 'mydb', 'towns', 'town_code');
-      INSERT INTO `PMA_relation` VALUES ('mydb', 'persons', 'country_code', 'mydb', 'countries', 'country_code');
+      INSERT INTO `PMA_relation` VALUES ('mydb', 'REL_persons', 'town_code', 'mydb', 'REL_towns', 'town_code');
+      INSERT INTO `PMA_relation` VALUES ('mydb', 'REL_persons', 'country_code', 'mydb', 'REL_countries', 'country_code');
+      INSERT INTO `PMA_table_info` VALUES ('mydb', 'REL_towns', 'description');
+      INSERT INTO `PMA_table_info` VALUES ('mydb', 'REL_countries', 'description');
Then test like this: