Compare commits

..

No commits in common. "e5109b66e85e56d63e1de0cb552c7a157e874ecd" and "b23bc59e8c77e17a0f26de610ba49eec17d32006" have entirely different histories.

12 changed files with 11 additions and 133 deletions

View file

@ -34,15 +34,7 @@ class remove_jabber extends migration
$this->table_prefix . 'users' => [
'user_jabber',
],
],
'add_columns' => [
$this->table_prefix . 'user_notifications' => [
'id' => ['ULINT', null, 'auto_increment'],
],
],
'add_primary_keys' => [
$this->table_prefix . 'user_notifications' => ['id'],
],
]
];
}
@ -53,12 +45,7 @@ class remove_jabber extends migration
$this->table_prefix . 'users' => [
'user_jabber' => ['VCHAR_UNI', ''],
],
],
'drop_columns' => [
$this->table_prefix . 'user_notifications' => [
'id',
],
],
]
];
}
@ -114,26 +101,11 @@ class remove_jabber extends migration
];
}
public function move_jabber_to_email_notifications(int|null $start)
public function move_jabber_to_email_notifications()
{
$limit = 1000;
$sql = 'SELECT id FROM ' . $this->tables['user_notifications'] . "
WHERE method = 'notification.method.jabber'
ORDER BY id ASC";
$result = $this->db->sql_query_limit($sql, $limit, $start ?: 0);
$rowset = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
$ids_array = array_column($rowset, 'id');
if (count($ids_array))
{
$sql = 'UPDATE ' . $this->tables['user_notifications'] . '
SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . '
WHERE ' . $this->db->sql_in_set('id', $ids_array);
$this->db->sql_query($sql);
}
return count($ids_array) < $limit ? true : $start + $limit;
$sql = 'UPDATE ' . $this->tables['user_notifications'] . '
SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . "
WHERE method = 'notification.method.jabber'";
$this->db->sql_query($sql);
}
}

View file

@ -185,7 +185,6 @@ class schema_generator
'drop_columns' => 'COLUMNS',
'change_columns' => 'COLUMNS',
'add_index' => 'KEYS',
'add_primary_keys' => 'PRIMARY_KEY',
'add_unique_index' => 'KEYS',
'drop_keys' => 'KEYS',
'rename_index' => 'KEYS',

View file

@ -398,7 +398,7 @@ class doctrine implements tools_interface
return $this->alter_schema(
function (Schema $schema) use ($table_name, $column): void
{
$this->schema_create_primary_key($schema, $table_name, $column);
$this->schema_create_primary_key($schema, $column, $table_name);
}
);
}
@ -990,16 +990,16 @@ class doctrine implements tools_interface
/**
* Creates primary key for a table
*
* @param $column
* @param Schema $schema
* @param string $table_name
* @param array|string $column_name
* @param bool $safe_check
*
* @throws SchemaException
*/
protected function schema_create_primary_key(Schema $schema, string $table_name, array|string $column_name, bool $safe_check = false): void
protected function schema_create_primary_key(Schema $schema, $column, string $table_name, bool $safe_check = false): void
{
$columns = (is_array($column_name)) ? $column_name : [$column_name];
$columns = (is_array($column)) ? $column : [$column];
$table = $schema->getTable($table_name);
$table->dropPrimaryKey();
$table->setPrimaryKey($columns);

View file

@ -164,14 +164,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>2</value>
@ -179,7 +177,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>3</value>
@ -187,7 +184,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>4</value>
@ -195,7 +191,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>5</value>
@ -203,7 +198,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>6</value>
@ -211,7 +205,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>7</value>
@ -219,7 +212,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>8</value>
@ -227,7 +219,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
@ -235,7 +226,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
@ -243,7 +233,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
@ -251,7 +240,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
@ -259,7 +247,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
@ -267,7 +254,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
@ -275,7 +261,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>

View file

@ -119,14 +119,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.bookmark</value>
<value>0</value>
<value>2</value>
@ -134,7 +132,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.bookmark</value>
<value>0</value>
<value>3</value>
@ -142,7 +139,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.bookmark</value>
<value>0</value>
<value>4</value>
@ -150,7 +146,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.bookmark</value>
<value>0</value>
<value>5</value>
@ -158,7 +153,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.bookmark</value>
<value>0</value>
<value>6</value>
@ -166,7 +160,6 @@
<value>0</value>
</row>
<row>
<value></value>
<value>notification.type.bookmark</value>
<value>0</value>
<value>3</value>

View file

@ -155,14 +155,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>2</value>
@ -170,7 +168,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>3</value>
@ -178,7 +175,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>4</value>
@ -186,7 +182,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>5</value>
@ -194,7 +189,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>6</value>
@ -202,7 +196,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>7</value>
@ -210,7 +203,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>8</value>
@ -218,7 +210,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
@ -226,7 +217,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
@ -234,7 +224,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
@ -242,7 +231,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
@ -250,7 +238,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
@ -258,7 +245,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
@ -266,7 +252,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>

View file

@ -136,14 +136,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.mention</value>
<value>0</value>
<value>2</value>
@ -151,7 +149,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.mention</value>
<value>0</value>
<value>3</value>
@ -159,7 +156,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.mention</value>
<value>0</value>
<value>4</value>
@ -167,7 +163,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.mention</value>
<value>0</value>
<value>5</value>
@ -175,7 +170,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.mention</value>
<value>0</value>
<value>6</value>
@ -183,7 +177,6 @@
<value>0</value>
</row>
<row>
<value></value>
<value>notification.type.mention</value>
<value>0</value>
<value>8</value>

View file

@ -155,14 +155,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>2</value>
@ -170,7 +168,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>3</value>
@ -178,7 +175,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>4</value>
@ -186,7 +182,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>5</value>
@ -194,7 +189,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>6</value>
@ -202,7 +196,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>7</value>
@ -210,7 +203,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>8</value>
@ -218,7 +210,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
@ -226,7 +217,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
@ -234,7 +224,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
@ -242,7 +231,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
@ -250,7 +238,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
@ -258,7 +245,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
@ -266,7 +252,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>

View file

@ -103,14 +103,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>2</value>
@ -118,7 +116,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>3</value>
@ -126,7 +123,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>4</value>
@ -134,7 +130,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>5</value>
@ -142,7 +137,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>6</value>
@ -150,7 +144,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>7</value>
@ -158,7 +151,6 @@
<value>0</value>
</row>
<row>
<value></value>
<value>notification.type.needs_approval</value>
<value>0</value>
<value>9</value>

View file

@ -91,14 +91,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.quote</value>
<value>0</value>
<value>2</value>
@ -106,7 +104,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.quote</value>
<value>0</value>
<value>3</value>
@ -114,7 +111,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.quote</value>
<value>0</value>
<value>4</value>
@ -122,7 +118,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.quote</value>
<value>0</value>
<value>5</value>
@ -130,7 +125,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.quote</value>
<value>0</value>
<value>6</value>

View file

@ -99,14 +99,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.topic</value>
<value>0</value>
<value>2</value>
@ -114,7 +112,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.topic</value>
<value>0</value>
<value>6</value>
@ -122,7 +119,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.topic</value>
<value>0</value>
<value>7</value>
@ -130,7 +126,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.topic</value>
<value>0</value>
<value>8</value>

View file

@ -185,14 +185,12 @@
</row>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>2</value>
@ -200,7 +198,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>3</value>
@ -208,7 +205,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>4</value>
@ -216,7 +212,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>5</value>
@ -224,7 +219,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>6</value>
@ -232,7 +226,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>7</value>
@ -240,7 +233,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.post</value>
<value>0</value>
<value>8</value>
@ -248,7 +240,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
@ -256,7 +247,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
@ -264,7 +254,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
@ -272,7 +261,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
@ -280,7 +268,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
@ -288,7 +275,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
@ -296,7 +282,6 @@
<value>1</value>
</row>
<row>
<value></value>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>