Fix migrations for PSQL

ConductionNL · Aug 12, 2024 · 7535d63 · 7535d63
1 parent db82028
commit 7535d63
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/lib/Db/Catalog.php b/lib/Db/Catalog.php
@@ -42,12 +42,6 @@ public function getJsonFields(): array
 
 	public function hydrate(array $object): self
 	{
-
-
-		if(isset($object['metadata']) === false) {
-			$object['metadata'] = [];
-		}
-
 		$jsonFields = $this->getJsonFields();
 
 		foreach($object as $key => $value) {

diff --git a/lib/Migration/Version6Date20240723125106.php b/lib/Migration/Version6Date20240723125106.php
@@ -80,18 +80,18 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'notnull' => false,
 			]
 			);
-			$table->addColumn(name: 'organization', typeName: TYPES::JSON, options: [
-				'default' => 'a:0:{}',
+			$organization = $table->addColumn(name: 'organization', typeName: TYPES::JSON, options: [
 				'notnull' => false,
 			]);
-			$table->addColumn(name: 'data', typeName: TYPES::JSON, options: [
-				'default' => 'a:0:{}',
+			$organization->setDefault('{}');
+			$data = $table->addColumn(name: 'data', typeName: TYPES::JSON, options: [
 				'notnull' => false,
 			]);
-			$table->addColumn(name: 'attachments', typeName: TYPES::JSON, options: [
-				'default' => 'a:0:{}',
+			$data->setDefault('{}');
+			$attachments = $table->addColumn(name: 'attachments', typeName: TYPES::JSON, options: [
 				'notnull' => false,
 			]);
+			$attachments->setDefault('{}');
 			$table->addColumn(name: 'attachment_count', typeName: TYPES::INTEGER);
 			$table->addColumn(name: 'schema', typeName: TYPES::STRING);
 			$table->addColumn(name: 'status', typeName: TYPES::STRING);

diff --git a/lib/Migration/Version6Date20240808085441.php b/lib/Migration/Version6Date20240808085441.php
@@ -53,13 +53,13 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 					]);
 			}
 			if($table->hasColumn(name: 'metadata') === false) {
-				$table->addColumn(
+				$metadata = $table->addColumn(
 					name: 'metadata',
 					typeName: Types::JSON,
 					options: [
 						'notNull' => false,
-						'default' => 'a:0:{}'
 					]);
+				$metadata->setDefault('{}');
 			}
 
 		}