diff --git a/lib/Db/TreeMapper.php b/lib/Db/TreeMapper.php index 99784493..faacdabc 100644 --- a/lib/Db/TreeMapper.php +++ b/lib/Db/TreeMapper.php @@ -7,7 +7,6 @@ namespace OCA\Bookmarks\Db; -use Doctrine\DBAL\Types\Type; use OCA\Bookmarks\Events\BeforeDeleteEvent; use OCA\Bookmarks\Events\MoveEvent; use OCA\Bookmarks\Events\UpdateEvent; diff --git a/lib/Db/Types.php b/lib/Db/Types.php new file mode 100644 index 00000000..d1cc4111 --- /dev/null +++ b/lib/Db/Types.php @@ -0,0 +1,110 @@ + + * + * @author 2021 Christoph Wurst + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\Bookmarks\Db; + +/** + * Database types supported by Nextcloud's DBs + * + * Use these constants instead of \Doctrine\DBAL\Types\Type or \Doctrine\DBAL\Types\Types + * + * FIXME: Remove this as soon as min nc version is 21 + */ +final class Types { + /** + * @var string + * @since 21.0.0 + */ + public const BIGINT = 'bigint'; + + /** + * @var string + * @since 21.0.0 + */ + public const BINARY = 'binary'; + + /** + * @var string + * @since 21.0.0 + */ + public const BLOB = 'blob'; + + /** + * @var string + * @since 21.0.0 + */ + public const BOOLEAN = 'boolean'; + + /** + * @var string + * @since 21.0.0 + */ + public const DATE = 'date'; + + /** + * @var string + * @since 21.0.0 + */ + public const DATETIME = 'datetime'; + + /** + * @var string + * @since 21.0.0 + */ + public const DECIMAL = 'decimal'; + + /** + * @var string + * @since 21.0.0 + */ + public const FLOAT = 'float'; + + /** + * @var string + * @since 21.0.0 + */ + public const INTEGER = 'integer'; + + /** + * @var string + * @since 21.0.0 + */ + public const SMALLINT = 'smallint'; + + /** + * @var string + * @since 21.0.0 + */ + public const STRING = 'string'; + + /** + * @var string + * @since 21.0.0 + */ + public const TEXT = 'text'; + + /** + * @var string + * @since 21.0.0 + */ + public const TIME = 'time'; +} diff --git a/lib/Migration/Version003000009Date20200505094721.php b/lib/Migration/Version003000009Date20200505094721.php index 7e94ff92..a8ac9b64 100644 --- a/lib/Migration/Version003000009Date20200505094721.php +++ b/lib/Migration/Version003000009Date20200505094721.php @@ -9,7 +9,7 @@ namespace OCA\Bookmarks\Migration; use Closure; use Doctrine\DBAL\Schema\SchemaException; -use Doctrine\DBAL\Types\Type; +use OCA\Bookmarks\Db\Types; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; use OCP\Migration\IOutput; @@ -49,7 +49,7 @@ class Version003000009Date20200505094721 extends SimpleMigrationStep { $schema = $schemaClosure(); $table = $schema->getTable('bookmarks_tree'); $table->changeColumn('index', [ - 'type' => Type::getType('bigint'), + 'type' => Types::BIGINT, 'unsigned' => true, ]); return $schema; diff --git a/lib/Migration/Version003004000Date20200807124721.php b/lib/Migration/Version003004000Date20200807124721.php index a2dc08d5..75703179 100644 --- a/lib/Migration/Version003004000Date20200807124721.php +++ b/lib/Migration/Version003004000Date20200807124721.php @@ -9,7 +9,7 @@ namespace OCA\Bookmarks\Migration; use Closure; use Doctrine\DBAL\Schema\SchemaException; -use Doctrine\DBAL\Types\Type; +use OCA\Bookmarks\Db\Types; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; use OCP\Migration\IOutput; @@ -49,7 +49,7 @@ class Version003004000Date20200807124721 extends SimpleMigrationStep { $schema = $schemaClosure(); if ($schema->hasTable('bookmarks')) { $table = $schema->getTable('bookmarks'); - $table->addColumn('available', Type::BOOLEAN, [ + $table->addColumn('available', Types::BOOLEAN, [ 'notnull' => true, 'default' => true, ]); diff --git a/lib/Migration/Version003004000Date20200817124721.php b/lib/Migration/Version003004000Date20200817124721.php index 30db9d81..4d860320 100644 --- a/lib/Migration/Version003004000Date20200817124721.php +++ b/lib/Migration/Version003004000Date20200817124721.php @@ -9,7 +9,7 @@ namespace OCA\Bookmarks\Migration; use Closure; use Doctrine\DBAL\Schema\SchemaException; -use Doctrine\DBAL\Types\Type; +use OCA\Bookmarks\Db\Types; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; use OCP\Migration\IOutput; @@ -49,7 +49,7 @@ class Version003004000Date20200817124721 extends SimpleMigrationStep { $schema = $schemaClosure(); if ($schema->hasTable('bookmarks')) { $table = $schema->getTable('bookmarks'); - $table->addColumn('archived_file', Type::BIGINT, [ + $table->addColumn('archived_file', Types::BIGINT, [ 'notnull' => false, ]); } diff --git a/psalm.xml b/psalm.xml index 0ff2508d..f083ece2 100644 --- a/psalm.xml +++ b/psalm.xml @@ -29,7 +29,6 @@ -