aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2023-11-09 08:08:50 +0100
committerGitHub <noreply@github.com>2023-11-09 08:08:50 +0100
commita12ce245898f491339b585f2805925c07e776943 (patch)
tree7a38da5f691d97571b476f621c0e73fe92eec86c
parenta79dbf3a31f8127b5e12d978e8df90e764a5c3ec (diff)
parent960b95bb8ec1c4e93eb4bad030b9fe5907431ad0 (diff)
downloadnextcloud-server-a12ce245898f491339b585f2805925c07e776943.tar.gz
nextcloud-server-a12ce245898f491339b585f2805925c07e776943.zip
Merge pull request #41351 from nextcloud/bugfix/noid/fix-filesmetadata-migration
fix(migration): Fix files metadata migration
-rw-r--r--core/Migrations/Version28000Date20231004103301.php35
-rw-r--r--version.php2
2 files changed, 26 insertions, 11 deletions
diff --git a/core/Migrations/Version28000Date20231004103301.php b/core/Migrations/Version28000Date20231004103301.php
index 3266bf3a440..8888bf51910 100644
--- a/core/Migrations/Version28000Date20231004103301.php
+++ b/core/Migrations/Version28000Date20231004103301.php
@@ -42,12 +42,16 @@ class Version28000Date20231004103301 extends SimpleMigrationStep {
$table->addColumn('id', Types::BIGINT, [
'autoincrement' => true,
'notnull' => true,
- 'length' => 15,
- 'unsigned' => true,
+ 'length' => 20,
+ ]);
+ $table->addColumn('file_id', Types::BIGINT, [
+ 'notnull' => true,
+ 'length' => 20,
]);
- $table->addColumn('file_id', Types::BIGINT, ['notnull' => false, 'length' => 15,]);
$table->addColumn('json', Types::TEXT);
- $table->addColumn('sync_token', Types::STRING, ['length' => 15]);
+ $table->addColumn('sync_token', Types::STRING, [
+ 'length' => 15,
+ ]);
$table->addColumn('last_update', Types::DATETIME);
$table->setPrimaryKey(['id']);
@@ -60,13 +64,24 @@ class Version28000Date20231004103301 extends SimpleMigrationStep {
$table->addColumn('id', Types::BIGINT, [
'autoincrement' => true,
'notnull' => true,
- 'length' => 15,
- 'unsigned' => true,
+ 'length' => 20,
+ ]);
+ $table->addColumn('file_id', Types::BIGINT, [
+ 'notnull' => true,
+ 'length' => 20,
+ ]);
+ $table->addColumn('meta_key', Types::STRING, [
+ 'notnull' => false,
+ 'length' => 31,
+ ]);
+ $table->addColumn('meta_value_string', Types::STRING, [
+ 'notnull' => false,
+ 'length' => 63,
+ ]);
+ $table->addColumn('meta_value_int', Types::BIGINT, [
+ 'notnull' => false,
+ 'length' => 11,
]);
- $table->addColumn('file_id', Types::BIGINT, ['notnull' => false, 'length' => 15]);
- $table->addColumn('meta_key', Types::STRING, ['notnull' => false, 'length' => 31]);
- $table->addColumn('meta_value_string', Types::STRING, ['notnull' => false, 'length' => 63]);
- $table->addColumn('meta_value_int', Types::BIGINT, ['notnull' => false, 'length' => 11]);
$table->setPrimaryKey(['id']);
$table->addIndex(['file_id', 'meta_key', 'meta_value_string'], 'f_meta_index');
diff --git a/version.php b/version.php
index d62cfe9cd50..1bb7ff3e377 100644
--- a/version.php
+++ b/version.php
@@ -30,7 +30,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level
// when updating major/minor version number.
-$OC_Version = [28, 0, 0, 3];
+$OC_Version = [28, 0, 0, 4];
// The human-readable string
$OC_VersionString = '28.0.0 beta 1';