cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [conflict] resolved in user_org update script

pull/79/head
iglocska 2021-11-25 00:43:22 +01:00
parent 1ee895cedf
commit b981b3f942
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/Migrations/20211123152707_user_org.php
View File

@ -18,7 +18,6 @@ final class UserOrg extends AbstractMigration
*/ */
public function change(): void public function change(): void
{ {
<<<<<<< HEAD
$exists = $this->table('users')->hasColumn('organisation_id'); $exists = $this->table('users')->hasColumn('organisation_id');
if (!$exists) { if (!$exists) {
$this->table('users') $this->table('users')
@ -31,17 +30,6 @@ final class UserOrg extends AbstractMigration
->addIndex('organisation_id') ->addIndex('organisation_id')
->update(); ->update();
} }
=======
$alignments = $this->table('users')
->addColumn('organisation_id', 'integer', [
'default' => null,
'null' => true,
'signed' => false,
'length' => 10
])
->addIndex('organisation_id')
->update();
>>>>>>> main
$q1 = $this->getQueryBuilder(); $q1 = $this->getQueryBuilder();
$org_id = $q1->select(['min(id)'])->from('organisations')->execute()->fetchAll()[0][0]; $org_id = $q1->select(['min(id)'])->from('organisations')->execute()->fetchAll()[0][0];
if (!empty($org_id)) { if (!empty($org_id)) {