Merge pull request #15 from srtlg/fixes-for-mariadb-10.6

Fixes for mariadb 10.6
rudolphi · Feb 22, 2022 · 91c4798 · 91c4798
2 parents 608d2d5 + e4fb1c3
commit 91c4798
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 9 deletions.
diff --git a/lib_constants_tables_analytics.php b/lib_constants_tables_analytics.php
@@ -36,7 +36,7 @@
 	"versioning" => true, "recordCreationChange" => true, 
 
 	"fields" => array(
-		"analytical_data_id" => array("type" => "INT UNSIGNED", "search" => "auto", "fk" => "analytical_data_id", ),
+		"analytical_data_id" => array("type" => "INT UNSIGNED", "search" => "auto", "fk" => "analytical_data", ),
 		"project_id" => array("type" => "INT UNSIGNED", "search" => "auto", "fk" => "project", ),
 		"reaction_id" => array("type" => "INT UNSIGNED", "search" => "auto", "fk" => "reaction", ),
 		"image_no" => array("type" => "INT", "search" => "auto", "index" => true, ), // 1,2,...
@@ -77,7 +77,7 @@
 		"analytical_data_raw_blob" => array("type" => "MEDIUMBLOB"), // rohdaten, zip
 		"analytical_data_blob" => array("type" => "MEDIUMBLOB", "flags" => FIELD_IMAGE, ), // bearbeitete daten, zip
 		"measured_by" => array("type" => "TINYTEXT", "search" => "auto"), 
-		"solvent" => array("type" => "INT UNSIGNED", "search" => "auto", "fk" => "solvent", ), // (in particular for NMR), use this perhaps also for solvents used in reations
+		"solvent" => array("type" => "INT UNSIGNED", "search" => "auto"), // (in particular for NMR), use this perhaps also for solvents used in reations
 		"analytical_data_interpretation" => array("type" => "TEXT", "search" => "auto"),
 		"analytical_data_comment" => array("type" => "TEXT", "search" => "auto"),
 		"analytical_data_properties_blob" => array("type" => "MEDIUMBLOB"),
@@ -245,4 +245,4 @@
 ); // zB NMR, GC, GC-MS
 
 
-?>
+?>
diff --git a/lib_root_funcs.php b/lib_root_funcs.php
@@ -285,15 +285,11 @@ function getColumn($name,$data) { // Array
 	if (isset($data["default"])) {
 		$dataType.=" DEFAULT ".$data["default"];
 	}
-	
+
 	if (!empty($data["collate"])) {
 		$dataType.=" COLLATE ".$data["collate"];
 	}
-
-	if (!empty($data["fk"])) {
-		$dataType.=" REFERENCES ".$data["fk"]."(".getShortPrimary($data["fk"]).")";
-	}
-
+
 	$field_def=array(
 		"name" => $name, 
 		"def" => $dataType, 
@@ -439,6 +435,12 @@ function createDefaultTableEntries($tabname) {
 			break;
 			}
 		}
+	} elseif ($tabname == "person") {
+	    $sql_query[]="SET SESSION sql_mode='NO_AUTO_VALUE_ON_ZERO';";
+	    $sql_query[]="INSERT INTO ".$tabname." SET ".
+	   	    "person_id=0,".
+	   	    "username=\"root\"".
+	   	    ";";
 	}
 	performQueries($sql_query,$db);
 }
@@ -474,6 +476,36 @@ function createViews() {
 	}
 }
 
+function createTableConstraint($tabname)
+{
+    global $db,$tables;
+    $constraint_query = array();
+
+    $tabdata=& $tables[$tabname];
+    $constraint = 1;
+
+    if (is_array($tabdata["fields"])) foreach ($tabdata["fields"] as $name => $data) {
+        if (!empty($data["fk"])) {
+            $constraint_query [] =
+                "ALTER TABLE ".$tabname.
+                " ADD CONSTRAINT ".$tabname."_fk".$constraint.
+                " FOREIGN KEY (".$name.")".
+                " REFERENCES ".$data["fk"]."(".getShortPrimary($data["fk"]).")".
+                ";";
+            $constraint++;
+        }
+    }
+    performQueries($constraint_query, $db);
+}
+
+function createConstraints() {
+    global $tables;
+    $tabnames=array_keys($tables);
+    foreach ($tabnames as $tabname) {
+        createTableConstraint($tabname);
+    }
+}
+
 function containsInvalidChars($text) {
 	if (preg_match("/^[a-zA-Z0-9_]+\$/",$text)) {
 		return false;
@@ -516,6 +548,7 @@ function setupInitTables($db_name) { // requires root
 		// Tabellen erstellen
 		createTables();
 		createViews();
+		createConstraints();
 		// Views erstellen (rely on tables)
 		setGVar("Version",currentVersion);
 		$version=currentVersion;