From 63645a279a1f18ae1e3a419c07fed9c233641735 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Thu, 13 Jan 2022 00:08:26 +0300
Subject: [PATCH] simplify mysql settings for docker tests

---
 .../mtt-php80-apache-mariadb105/compose.yml    |  5 +++++
 .../mtt-php81-apache-mariadb105/compose.yml    |  5 +++++
 src/db/docker-config.php                       | 18 ++++++++++++++++++
 src/setup.php                                  | 10 ++++++++--
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 src/db/docker-config.php

diff --git a/docker/dev/mtt-php80-apache-mariadb105/compose.yml b/docker/dev/mtt-php80-apache-mariadb105/compose.yml
index c86a3dd..fb2f3c5 100644
--- a/docker/dev/mtt-php80-apache-mariadb105/compose.yml
+++ b/docker/dev/mtt-php80-apache-mariadb105/compose.yml
@@ -15,6 +15,11 @@ services:
       - "8080:80"
     environment:
       - MTT_ENABLE_DEBUG=YES
+      - MTT_DB_TYPE=mysqli
+      - MTT_DB_HOST=db
+      - MTT_DB=mytinytodo
+      - MTT_DB_USER=mtt
+      - MTT_DB_PASSWORD=mtt
     volumes:
       - ../../../src:/var/www/html
     depends_on:
diff --git a/docker/dev/mtt-php81-apache-mariadb105/compose.yml b/docker/dev/mtt-php81-apache-mariadb105/compose.yml
index 6cdd679..5a43408 100644
--- a/docker/dev/mtt-php81-apache-mariadb105/compose.yml
+++ b/docker/dev/mtt-php81-apache-mariadb105/compose.yml
@@ -15,6 +15,11 @@ services:
       - "8080:80"
     environment:
       - MTT_ENABLE_DEBUG=YES
+      - MTT_DB_TYPE=mysqli
+      - MTT_DB_HOST=db
+      - MTT_DB=mytinytodo
+      - MTT_DB_USER=mtt
+      - MTT_DB_PASSWORD=mtt
     volumes:
       - ../../../src:/var/www/html
     depends_on:
diff --git a/src/db/docker-config.php b/src/db/docker-config.php
new file mode 100644
index 0000000..239c646
--- /dev/null
+++ b/src/db/docker-config.php
@@ -0,0 +1,18 @@
+<?php
+
+// Rename it to config.php before using in docker.
+// On install it will be overwritten.
+
+$config = array();
+
+if (getenv('MTT_DB_TYPE') == 'mysqli') {
+	$config['db'] = 'mysql';
+	$config['mysql.host'] = getenv('MTT_DB_HOST');
+	$config['mysql.db'] = getenv('MTT_DB');
+	$config['mysql.user'] = getenv('MTT_DB_USER');
+	$config['mysql.password'] = getenv('MTT_DB_PASSWORD');
+	$config['prefix'] = 'mtt_';
+	$config['mysqli'] = 1;
+}
+
+?>
\ No newline at end of file
diff --git a/src/setup.php b/src/setup.php
index a53a561..505cb61 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -61,9 +61,15 @@ $ver = $db ? get_ver($db, $dbtype) : '';
 
 if (!$ver)
 {
-	# Which DB to select
-	if(!isset($_POST['installdb']) && !isset($_POST['install']))
+	if (!isset($_POST['installdb']) && !isset($_POST['install']) && $db !== null)
 	{
+		# We already have settings file and need to create tables.
+		exitMessage("<form method=post>Click next to create tables in '". htmlspecialchars($dbtype). "' database.<br><br>
+					<input type=hidden name=install value=db><input type=submit value=' Next '></form>");
+	}
+	else if (!isset($_POST['installdb']) && !isset($_POST['install']))
+	{
+		# Select database and connection settings to save.
 		exitMessage("<form method=post>Select database type to use:<br><br>
 <label><input type=radio name=installdb value=sqlite checked=checked onclick=\"document.getElementById('mysqlsettings').style.display='none'\">SQLite</label><br><br>
 <label><input type=radio name=installdb value=mysql onclick=\"document.getElementById('mysqlsettings').style.display=''\">MySQL</label><br>