Skip to content

Commit 07392e5

Browse files
committed
--amend
1 parent d8482ab commit 07392e5

1 file changed

Lines changed: 4 additions & 41 deletions

File tree

system/Database/Config.php

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -151,50 +151,13 @@ public static function forge($group = null)
151151
/**
152152
* Returns a new instance of the Database Utilities class.
153153
*
154-
* @param string|null $group
154+
* @param string|array|null $group
155155
*
156156
* @return BaseUtils
157157
*/
158-
public static function utils(string $group = null)
158+
public static function utils($group = null)
159159
{
160-
// Allow custom connections to be sent in
161-
if (is_array($group))
162-
{
163-
$config = $group;
164-
$group = 'custom-' . md5(json_encode($config));
165-
}
166-
else
167-
{
168-
$config = config('Database');
169-
}
170-
171-
static::ensureFactory();
172-
173-
if (empty($group))
174-
{
175-
$group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
176-
}
177-
178-
if (is_string($group) && ! isset($config->$group) && ! is_array($config))
179-
{
180-
throw new \InvalidArgumentException($group . ' is not a valid database connection group.');
181-
}
182-
183-
if (! isset(static::$instances[$group]))
184-
{
185-
if (is_array($config))
186-
{
187-
$db = static::connect($config);
188-
}
189-
else
190-
{
191-
$db = static::connect($group);
192-
}
193-
}
194-
else
195-
{
196-
$db = static::$instances[$group];
197-
}
160+
$db = static::connect($group);
198161

199162
return static::$factory->loadUtils($db);
200163
}
@@ -210,7 +173,7 @@ public static function utils(string $group = null)
210173
*/
211174
public static function seeder(string $group = null)
212175
{
213-
$config = new \Config\Database();
176+
$config = config('Database');
214177

215178
return new Seeder($config, static::connect($group));
216179
}

0 commit comments

Comments
 (0)