X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommodsDatabase.pm;h=f704f1241b90495b05eb120066bc52259b403030;hp=3cb543dc43b3866971cff2cb28e39de7f6061631;hb=a10948d5fc25a14690fc50219a47739fcead10af;hpb=8de9e86e749db455deea697684b67be7874c5efa

diff --git a/yarrg/CommodsDatabase.pm b/yarrg/CommodsDatabase.pm
index 3cb543d..f704f12 100644
--- a/yarrg/CommodsDatabase.pm
+++ b/yarrg/CommodsDatabase.pm
@@ -67,7 +67,7 @@ sub db_connect_core ($) {
     my $h= DBI->connect("dbi:SQLite:$fn",'','',
 		       { AutoCommit=>0,
 			 RaiseError=>1, ShowErrorStatement=>1,
-			 unicode=>1 })
+			 sqlite_unicode=>1 })
 	or die "$fn $DBI::errstr ?";
     return $h;
     # default timeout is 30s which is plenty
@@ -188,12 +188,13 @@ sub db_check_referential_integrity ($) {
 	nooutput(<<END);
 
  # Every buy/sell must refer to an entry in commods, islands, and stalls:
- SELECT * FROM $bs NATURAL LEFT JOIN commods WHERE commodname IS NULL;
- SELECT * FROM $bs NATURAL LEFT JOIN islands WHERE islandname IS NULL;
- SELECT * FROM $bs LEFT JOIN STALLS USING (stallid) WHERE stallname IS NULL;
+ SELECT * FROM $bs LEFT JOIN commods USING (commodid) WHERE commodname IS NULL;
+ SELECT * FROM $bs LEFT JOIN islands USING (islandid) WHERE islandname IS NULL;
+ SELECT * FROM $bs LEFT JOIN stalls USING (stallid, islandid)
+                                                      WHERE stallname IS NULL;
 
  # Every buy/sell must be part of an upload:
- SELECT * FROM $bs NATURAL LEFT JOIN uploads WHERE timestamp IS NULL;
+ SELECT * FROM $bs LEFT JOIN uploads USING (islandid) WHERE timestamp IS NULL;
 
  # The islandid in stalls must be the same as the islandid in buy/sell:
  SELECT * FROM $bs JOIN stalls USING (stallid)
@@ -205,8 +206,10 @@ END
     nooutput(<<END);
 
  # Every stall and upload must refer to an island:
- SELECT * FROM stalls NATURAL LEFT JOIN islands WHERE islandname IS NULL;
- SELECT * FROM uploads NATURAL LEFT JOIN islands WHERE islandname IS NULL;
+ SELECT * FROM stalls LEFT JOIN islands USING (islandid)
+                                        WHERE islandname IS NULL;
+ SELECT * FROM uploads LEFT JOIN islands USING (islandid)
+                                         WHERE islandname IS NULL;
 
 END
     if ($full) {
@@ -229,9 +232,9 @@ END
 	WHERE dist IS NULL;
 
  # Every commod must refers to a commodclass and vice versa:
- SELECT * FROM commods NATURAL LEFT JOIN commodclasses
+ SELECT * FROM commods LEFT JOIN commodclasses USING (commodclassid)
 	WHERE commodclass IS NULL;
- SELECT * FROM commodclasses NATURAL LEFT JOIN commods
+ SELECT * FROM commodclasses LEFT JOIN commods USING (commodclassid)
 	WHERE commodname IS NULL;
 
  # Ordvals which are not commodclass ordvals are unique:
@@ -244,17 +247,17 @@ END
  # For every class, posinclass is dense from 1 to maxposinclass,
  # apart from the commods for which it is zero.
  SELECT commodclass,commodclassid,posinclass,count(*)
-	FROM commods NATURAL JOIN commodclasses
+	FROM commods JOIN commodclasses USING (commodclassid)
 	WHERE posinclass > 0
 	GROUP BY commodclassid,posinclass
 	HAVING count(*) > 1;
  SELECT commodclass,commodclassid,count(*)
-	FROM commods NATURAL JOIN commodclasses
+	FROM commods JOIN commodclasses USING (commodclassid)
 	WHERE posinclass > 0
 	GROUP BY commodclassid
 	HAVING count(*) != maxposinclass;
  SELECT *
-	FROM commods NATURAL JOIN commodclasses
+	FROM commods JOIN commodclasses USING (commodclassid)
 	WHERE posinclass < 0 OR posinclass > maxposinclass;
 
 END