Skip to content

Commit 3bc6e4a

Browse files
Merge pull request #543 from nextcloud/fix/db-types
Fix dbal type constants
2 parents c0a2f46 + e4f4399 commit 3bc6e4a

4 files changed

Lines changed: 7 additions & 10 deletions

File tree

lib/Migration/Version2006Date20170808154933.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
namespace OCA\Activity\Migration;
2525

26-
use Doctrine\DBAL\Types\Type;
26+
use Doctrine\DBAL\Types\Types;
2727
use OCP\DB\ISchemaWrapper;
2828
use OCP\Migration\SimpleMigrationStep;
2929
use OCP\Migration\IOutput;
@@ -43,7 +43,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
4343

4444
if (!$schema->hasTable('activity')) {
4545
$table = $schema->createTable('activity');
46-
$table->addColumn('activity_id', Type::BIGINT, [
46+
$table->addColumn('activity_id', Types::BIGINT, [
4747
'autoincrement' => true,
4848
'notnull' => true,
4949
'length' => 20,
@@ -100,7 +100,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
100100
'notnull' => false,
101101
'length' => 255,
102102
]);
103-
$table->addColumn('object_id', Type::BIGINT, [
103+
$table->addColumn('object_id', Types::BIGINT, [
104104
'notnull' => true,
105105
'length' => 20,
106106
'default' => 0,
@@ -115,7 +115,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
115115

116116
if (!$schema->hasTable('activity_mq')) {
117117
$table = $schema->createTable('activity_mq');
118-
$table->addColumn('mail_id', Type::BIGINT, [
118+
$table->addColumn('mail_id', Types::BIGINT, [
119119
'autoincrement' => true,
120120
'notnull' => true,
121121
'length' => 20,
@@ -156,5 +156,4 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
156156
}
157157
return $schema;
158158
}
159-
160159
}

lib/Migration/Version2008Date20181011095117.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
use Closure;
2828
use Doctrine\DBAL\Schema\SchemaException;
29-
use Doctrine\DBAL\Types\Type;
29+
use Doctrine\DBAL\Types\Types;
3030
use OCP\DB\ISchemaWrapper;
3131
use OCP\Migration\SimpleMigrationStep;
3232
use OCP\Migration\IOutput;
@@ -49,11 +49,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
4949
return null;
5050
}
5151

52-
$table->addColumn('object_type', Type::STRING, [
52+
$table->addColumn('object_type', Types::STRING, [
5353
'notnull' => false,
5454
'length' => 255,
5555
]);
56-
$table->addColumn('object_id', Type::BIGINT, [
56+
$table->addColumn('object_id', Types::BIGINT, [
5757
'notnull' => true,
5858
'length' => 20,
5959
'default' => 0,

lib/Migration/Version2011Date20201006132546.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
namespace OCA\Activity\Migration;
2626

2727
use Closure;
28-
use Doctrine\DBAL\Types\Type;
2928
use OCP\DB\ISchemaWrapper;
3029
use OCP\IDBConnection;
3130
use OCP\Migration\IOutput;

lib/Migration/Version2011Date20201006132547.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
namespace OCA\Activity\Migration;
2626

2727
use Closure;
28-
use Doctrine\DBAL\Types\Type;
2928
use OCP\DB\ISchemaWrapper;
3029
use OCP\Migration\IOutput;
3130
use OCP\Migration\SimpleMigrationStep;

0 commit comments

Comments
 (0)