Muutetaan kaikki SHOW TABLES - kyselyt näyttämään vain tauluja ja ski…

…ppaamaan näkymät.
devlab-oy · Oct 3, 2022 · 831f654 · 831f654
1 parent e8dd59a
commit 831f654
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/UTF8_mysqlkonversio.php b/UTF8_mysqlkonversio.php
@@ -12,7 +12,7 @@
 $sql = "ALTER DATABASE $dbkanta CHARACTER SET utf8 COLLATE utf8_unicode_ci;";
 pupe_query($sql);
 
-$query  = "SHOW TABLES FROM $dbkanta";
+$query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
 $tabresult = pupe_query($query);
 
 while ($tables = mysql_fetch_row($tabresult)) {

diff --git a/check-tables.php b/check-tables.php
@@ -24,7 +24,7 @@ function decho($string) {
 // Ollaanko annettu --verbose komentoriviltä
 $verbose_mode = (in_array("--verbose", $argv) !== false) ? true : false;
 
-$query = "show tables from $dbkanta";
+$query = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
 $result = pupe_query($query);
 
 decho("Check tables from $dbkanta.");

diff --git a/db-index.php b/db-index.php
@@ -7,7 +7,7 @@
 
 echo "<table><tr><td valign='top' class='back'>";
 
-$query  = "show tables from $dbkanta";
+$query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
 $result =  pupe_query($query);
 
 while ($row=mysql_fetch_array($result)) {

diff --git a/db.php b/db.php
@@ -7,7 +7,7 @@
 
 echo "<table><tr><td valign='top' class='back'>";
 
-$query  = "show tables from $dbkanta";
+$query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
 $result =  pupe_query($query);
 
 while ($row=mysql_fetch_array($result)) {

diff --git a/db_sql_query.php b/db_sql_query.php
@@ -45,11 +45,10 @@ function toggleAll(toggleBox) {
   echo "<tr><td><select name='table' onchange='submit();'>";
   echo "<option value=''></option>";
 
-  $query  = "SHOW tables FROM `$dbkanta`";
+  $query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
   $result =  pupe_query($query);
 
   while ($row = mysql_fetch_array($result)) {
-
     $query  = "describe $row[0]";
     $fieldresult = pupe_query($query);
 

diff --git a/lue_data.php b/lue_data.php
@@ -634,7 +634,7 @@ function lue_data_echo($string, $now = false) {
   }
 
   // Otetaan pupen talut haltuun
-  $query = "SHOW TABLES FROM `$dbkanta`";
+  $query = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
   $tableresult = pupe_query($query);
 
   $taulunrivit_keys = array_keys($taulunrivit);

diff --git a/mysqlaliasyllapito.php b/mysqlaliasyllapito.php
@@ -116,7 +116,7 @@
 }
 
 // Nyt selataan
-$query  = "SHOW TABLES FROM `$dbkanta`";
+$query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
 $tabresult = pupe_query($query);
 
 $sel[$taulu] = "SELECTED";

diff --git a/oletus_alv_muutos.php b/oletus_alv_muutos.php
@@ -54,7 +54,7 @@
 
     echo "<table>";
 
-    $query  = "SHOW TABLES FROM $dbkanta";
+    $query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
     $tabresult = pupe_query($query);
 
     while ($tables = mysql_fetch_array($tabresult)) {

diff --git a/vaihda_tuoteno.php b/vaihda_tuoteno.php
@@ -249,7 +249,7 @@ function kasittele_tuote_tiedosto($file_name, $real_name = '') {
   $locktables['avainsana'] = "avainsana";
 
   //$dbkanta --> tulee salasanat.php:stä
-  $query  = "SHOW TABLES FROM $dbkanta";
+  $query  = "SHOW FULL TABLES FROM `$dbkanta` WHERE Table_Type = 'BASE TABLE'";
   $tabresult = pupe_query($query);
 
   while ($tables = mysql_fetch_array($tabresult)) {
@@ -529,13 +529,13 @@ function kasittele_tuote_tiedosto($file_name, $real_name = '') {
                           AND liitos  = '$vantuoteno'";
                 pupe_query($query);
 
-				if ($uusi_on_jo != "SAMA") {
-                  $query = "DELETE FROM puun_alkio
-                            WHERE yhtio = '$kukarow[yhtio]'
-                            AND laji    = 'Tuote'
-                            AND liitos  = '$vantuoteno'";
-                  pupe_query($query);
-				}
+                if ($uusi_on_jo != "SAMA") {
+                          $query = "DELETE FROM puun_alkio
+                                    WHERE yhtio = '$kukarow[yhtio]'
+                                    AND laji    = 'Tuote'
+                                    AND liitos  = '$vantuoteno'";
+                          pupe_query($query);
+                }
               }
               elseif ($taulu == 'asn_sanomat') {
                 $query = "UPDATE asn_sanomat