Merge pull request #1554 from codeigniter4/serviceinstances

Serviceinstances

Author: lonnieezell

system/Database/Config.php

@@ -77,7 +77,7 @@ public static function connect($group = null, bool $getShared = true)
 		if (is_array($group))
 		{
 			$config = $group;
-			$group  = 'custom';
+			$group  = 'custom-' . md5(json_encode($config));
 		}
 
 		$config = $config ?? new \Config\Database();
@@ -87,7 +87,7 @@ public static function connect($group = null, bool $getShared = true)
 			$group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
 		}
 
-		if (is_string($group) && ! isset($config->$group) && $group !== 'custom')
+		if (is_string($group) && ! isset($config->$group) && strpos($group, 'custom-') !== 0)
 		{
 			throw new \InvalidArgumentException($group . ' is not a valid database connection group.');
 		}

tests/system/Database/Live/ConnectTest.php

@@ -0,0 +1,44 @@
+<?php namespace CodeIgniter\Database\Live;
+
+;
+
+use CodeIgniter\Test\CIDatabaseTestCase;
+use Config\Database;
+
+class AliasTest extends CIDatabaseTestCase
+{
+	protected $group1;
+
+	protected $group2;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$config = config('database');
+
+		$this->group1 = $config->default;
+		$this->group2 = $config->default;
+
+		$this->group1['strictOn'] = false;
+		$this->group2['strictOn'] = true;
+	}
+
+	public function testConnectWithMultipleCustomGroups()
+	{
+		// We should have our test database connection already.
+		$instances = $this->getPrivateProperty(Database::class, 'instances');
+		$this->assertEquals(1, count($instances));
+
+		$db1 = Database::connect($this->group1);
+		$db2 = Database::connect($this->group2);
+
+		$this->assertNotSame($db1, $db2);
+
+		$instances = $this->getPrivateProperty(Database::class, 'instances');
+		$this->assertEquals(3, count($instances));
+	}
+
+	//--------------------------------------------------------------------
+
+}