Skip to content

Fix usage of DBAL types #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Jan 7, 2021
Merged

Fix usage of DBAL types #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix usage of DBAL types 
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst
ChristophWurst committed Jan 5, 2021
commit be969da2ad65a732e846083b6962a4175eb10b57
2 changes: 1 addition & 1 deletion lib/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function count(INotification $notification): int {
$this->sqlWhere($sql, $notification);

$statement = $sql->execute();
$count = (int) $statement->fetchColumn();
$count = (int) $statement->fetchOne();
$statement->closeCursor();

return $count;
Expand Down
44 changes: 22 additions & 22 deletions lib/Migration/Version2004Date20190107135757.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
namespace OCA\Notifications\Migration;

use Closure;
use Doctrine\DBAL\Types\Type;
use Doctrine\DBAL\Types\Types;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
Expand All @@ -43,55 +43,55 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt

if (!$schema->hasTable('notifications')) {
$table = $schema->createTable('notifications');
$table->addColumn('notification_id', Type::INTEGER, [
$table->addColumn('notification_id', Types::INTEGER, [
'autoincrement' => true,
'notnull' => true,
'length' => 4,
]);
$table->addColumn('app', Type::STRING, [
$table->addColumn('app', Types::STRING, [
'notnull' => true,
'length' => 32,
]);
$table->addColumn('user', Type::STRING, [
$table->addColumn('user', Types::STRING, [
'notnull' => true,
'length' => 64,
]);
$table->addColumn('timestamp', Type::INTEGER, [
$table->addColumn('timestamp', Types::INTEGER, [
'notnull' => true,
'length' => 4,
'default' => 0,
]);
$table->addColumn('object_type', Type::STRING, [
$table->addColumn('object_type', Types::STRING, [
'notnull' => true,
'length' => 64,
]);
$table->addColumn('object_id', Type::STRING, [
$table->addColumn('object_id', Types::STRING, [
'notnull' => true,
'length' => 64,
]);
$table->addColumn('subject', Type::STRING, [
$table->addColumn('subject', Types::STRING, [
'notnull' => true,
'length' => 64,
]);
$table->addColumn('subject_parameters', Type::TEXT, [
$table->addColumn('subject_parameters', Types::TEXT, [
'notnull' => false,
]);
$table->addColumn('message', Type::STRING, [
$table->addColumn('message', Types::STRING, [
'notnull' => false,
'length' => 64,
]);
$table->addColumn('message_parameters', Type::TEXT, [
$table->addColumn('message_parameters', Types::TEXT, [
'notnull' => false,
]);
$table->addColumn('link', Type::STRING, [
$table->addColumn('link', Types::STRING, [
'notnull' => false,
'length' => 4000,
]);
$table->addColumn('icon', Type::STRING, [
$table->addColumn('icon', Types::STRING, [
'notnull' => false,
'length' => 4000,
]);
$table->addColumn('actions', Type::TEXT, [
$table->addColumn('actions', Types::TEXT, [
'notnull' => false,
]);
$table->setPrimaryKey(['notification_id']);
Expand All @@ -103,36 +103,36 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt

if (!$schema->hasTable('notifications_pushtokens')) {
$table = $schema->createTable('notifications_pushtokens');
$table->addColumn('uid', Type::STRING, [
$table->addColumn('uid', Types::STRING, [
'notnull' => true,
'length' => 64,
]);
$table->addColumn('token', Type::INTEGER, [
$table->addColumn('token', Types::INTEGER, [
'notnull' => true,
'length' => 4,
'default' => 0,
]);
$table->addColumn('deviceidentifier', Type::STRING, [
$table->addColumn('deviceidentifier', Types::STRING, [
'notnull' => true,
'length' => 128,
]);
$table->addColumn('devicepublickey', Type::STRING, [
$table->addColumn('devicepublickey', Types::STRING, [
'notnull' => true,
'length' => 512,
]);
$table->addColumn('devicepublickeyhash', Type::STRING, [
$table->addColumn('devicepublickeyhash', Types::STRING, [
'notnull' => true,
'length' => 128,
]);
$table->addColumn('pushtokenhash', Type::STRING, [
$table->addColumn('pushtokenhash', Types::STRING, [
'notnull' => true,
'length' => 128,
]);
$table->addColumn('proxyserver', Type::STRING, [
$table->addColumn('proxyserver', Types::STRING, [
'notnull' => true,
'length' => 256,
]);
$table->addColumn('apptype', Type::STRING, [
$table->addColumn('apptype', Types::STRING, [
'notnull' => true,
'length' => 32,
'default' => 'unknown',
Expand Down