Merge commit '2d558e45bf' into QA_5_0

phpmyadmin · Oct 21, 2019 · 8183b5e · 8183b5e
2 parents 1cdf57c + 2d558e4
commit 8183b5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog
 - issue #14898 Fixed bottom table in list in left panel blocked by horizontal scroll bar
 - issue #15161 Fix text area overflows its parent element on "Query" page
 - issue #15511 Fixed exporting users after a delete will delete all selected users on "Users" page
+- issue #14598 Fixed checking referencial integrity on "Operations" page
 
 4.9.1 (2019-09-20)
 - issue #15313 Added support for Twig 2

diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
@@ -1805,7 +1805,10 @@ public function getHtmlForReferentialIntegrityCheck(array $foreign, array $url_p
                 . ' IS NOT NULL';
             $this_url_params = array_merge(
                 $url_params,
-                ['sql_query' => $join_query]
+                [
+                   'sql_query' => $join_query,
+                   'sql_signature' => Core::signSqlQuery($join_query),
+                ]
             );
 
             $html_output .= '<li>'

diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php
@@ -85,7 +85,7 @@ protected function tearDown(): void
     private function _procedureSQL()
     {
         $this->dbQuery(
-            "CREATE PROCEDURE `test_procedure`(IN `inp` VARCHAR(10), OUT `outp` INT)"
+            "CREATE PROCEDURE `test_procedure`(IN `inp` VARCHAR(20), OUT `outp` INT)"
             . " NOT DETERMINISTIC READS SQL DATA SQL SECURITY DEFINER SELECT char_"
             . "length(inp) + count(*) FROM test_table INTO outp"
         );
@@ -114,7 +114,7 @@ public function testAddProcedure()
             $this->byName("item_param_type[0]"),
             'VARCHAR'
         );
-        $this->byName("item_param_length[0]")->sendKeys("10");
+        $this->byName("item_param_length[0]")->sendKeys("20");
 
         $this->byCssSelector("input[value='Add parameter']")->click();
 
@@ -146,7 +146,7 @@ public function testAddProcedure()
         );
 
         $this->assertEquals(1, $result->num_rows);
-        $this->_executeProcedure("test_procedure", 10);
+        $this->_executeProcedure("test_procedure", 14);
     }
 
     /**
@@ -170,7 +170,7 @@ public function testEditProcedure()
         $this->byPartialLinkText("Edit")->click();
         $this->waitForElement('className', "rte_form");
         $this->byName("item_param_length[0]")->clear();
-        $this->byName("item_param_length[0]")->sendKeys("12");
+        $this->byName("item_param_length[0]")->sendKeys("30");
 
         $this->byXPath("//button[contains(., 'Go')]")->click();
 
@@ -180,7 +180,7 @@ public function testEditProcedure()
             . "'Routine `test_procedure` has been modified')]"
         );
 
-        $this->_executeProcedure("test_procedure", 12);
+        $this->_executeProcedure("test_procedure", 14);
     }
 
     /**