Minz/quicknotes
1
0
Fork 0
mirror of https://github.com/JanGross/quicknotes.git synced 2025-11-30 23:37:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow nunlable to booleans needed due NC 22 changes.

Browse Source
This commit is contained in:
Matias De lellis
2021-07-08 11:58:24 -03:00
parent fe94cfc5cf
commit 551f1d8ce4
6 changed files with 51 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appinfo/info.xml
View File

@@ -5,7 +5,7 @@
<name>Quick notes</name>
<summary>Quick notes with a basic rich text</summary>
<description>Quick notes with a basic rich text</description>
<version>0.7.1</version>
<version>0.7.2</version>
<licence>agpl</licence>
<author>Matias De lellis</author>
<namespace>QuickNotes</namespace>
@@ -20,6 +20,6 @@
<screenshot>https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-attachments.jpeg</screenshot>
<screenshot>https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-shared-note.jpeg</screenshot>
<dependencies>
<nextcloud min-version="21" max-version="21"/>
<nextcloud min-version="21" max-version="22"/>
</dependencies>
</info>

24
lib/Db/Task.php
View File

@@ -1,24 +0,0 @@
<?php
namespace OCA\QuickNotes\Db;
use JsonSerializable;
use OCP\AppFramework\Db\Entity;
class Note extends Entity implements JsonSerializable {
protected $description;
protected $done;
protected $ordering;
protected $noteId;
public function jsonSerialize() {
return [
'id' => $this->id,
'description' => $this->description,
'done' => $this->done,
'ordering' => $this->ordering,
'noteId' => $this->noteId
];
}
}

23
lib/Db/TaskMapper.php
View File

@@ -1,23 +0,0 @@
<?php
namespace OCA\QuickNotes\Db;
use OCP\IDBConnection;
use OCP\AppFramework\Db\Mapper;
class TaskMapper extends Mapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'quicknotes_tasks', '\OCA\QuickNotes\Db\Tasks');
}
public function find($id, $noteId) {
$sql = 'SELECT * FROM *PREFIX*quicknotes_tasks WHERE id = ? AND note_id = ?';
return $this->findEntity($sql, [$id, $noteId]);
}
public function findAll($noteId) {
$sql = 'SELECT * FROM *PREFIX*quicknotes_tasks WHERE note_id = ?';
return $this->findEntities($sql, [$noteId]);
}
}

29
lib/Migration/Version000204Date20200530211356.php
View File

@@ -127,35 +127,6 @@ class Version000204Date20200530211356 extends SimpleMigrationStep {
$table->setPrimaryKey(['id']);
}
if (!$schema->hasTable('quicknotes_tasks')) {
$table = $schema->createTable('quicknotes_tasks');
$table->addColumn('id', 'bigint', [
'autoincrement' => true,
'notnull' => true,
'length' => 8,
'unsigned' => true,
]);
$table->addColumn('note_id', 'bigint', [
'notnull' => true,
'length' => 8,
'unsigned' => true,
]);
$table->addColumn('description', 'string', [
'notnull' => true,
'length' => 200,
'default' => '',
]);
$table->addColumn('done', 'boolean', [
'notnull' => true,
'default' => false,
]);
$table->addColumn('ordering', 'integer', [
'notnull' => true,
'default' => 0,
]);
$table->setPrimaryKey(['id']);
}
if (!$schema->hasTable('quicknotes_shares')) {
$table = $schema->createTable('quicknotes_shares');
$table->addColumn('id', 'bigint', [

2
lib/Migration/Version000205Date20200604122312.php
View File

@@ -26,7 +26,7 @@ class Version000205Date20200604122312 extends SimpleMigrationStep {
$table = $schema->getTable('quicknotes_notes');
$table->addColumn('pinned', 'boolean', [
'notnull' => true,
'notnull' => false,
'default' => false,
]);
return $schema;

48
lib/Migration/Version00720Date20210708130231.php Normal file
View File

@@ -0,0 +1,48 @@
<?php
declare(strict_types=1);
namespace OCA\QuickNotes\Migration;
use Closure;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
/**
* Auto-generated migration step: Please modify to your needs!
*/
class Version00720Date20210708130231 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
* @param array $options
* @return null|ISchemaWrapper
*/
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
/** @var ISchemaWrapper $schema */
$schema = $schemaClosure();
if ($schema->hasTable('quicknotes_tasks')) {
$schema->dropTable('quicknotes_tasks');
}
$this->ensureColumnIsNullable($schema, 'quicknotes_notes', 'pinned');
return $schema;
}
protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
$table = $schema->getTable($tableName);
$column = $table->getColumn($columnName);
if ($column->getNotnull()) {
$column->setNotnull(false);
return true;
}
return false;
}
}