amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Replace queries with hardcoded "monica" database name to use the current default connection database (#1372)

Browse Source
This commit is contained in:
Tom Rochette
2018-06-10 13:14:09 -04:00
committed by Alexis Saettler
parent ca83d67d41
commit d4a1abad6e
5 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SettingsController.php
+5 -2
View File
@@ -6,6 +6,7 @@ use App\Tag;
use App\User;
use App\ImportJob;
use App\Invitation;
use App\Helpers\DBHelper;
use Illuminate\Http\Request;
use App\Jobs\SendNewUserAlert;
use App\Jobs\ExportAccountAsSQL;
@@ -128,7 +129,7 @@ class SettingsController extends Controller
$user = $request->user();
$account = $user->account;
$tables = DB::select('SELECT table_name FROM information_schema.tables WHERE table_schema="monica"');
$tables = DBHelper::getTables();
// Looping over the tables
foreach ($tables as $table) {
@@ -166,8 +167,10 @@ class SettingsController extends Controller
$user = $request->user();
$account = $user->account;
$tables = DB::select('SELECT table_name FROM information_schema.tables WHERE table_schema="monica"');
$tables = DBHelper::getTables();
// TODO(tom@tomrochette.com): We cannot simply iterate over tables to reset an account
// as this will not work with foreign key constraints
// Looping over the tables
foreach ($tables as $table) {
$tableName = $table->table_name;