From 75fecf0b3ef6007f67bbfba47e84eff402301f48 Mon Sep 17 00:00:00 2001
From: Martin Vahlensieck <martin.vahlensieck@unibas.ch>
Date: Fri, 17 Jan 2025 16:31:50 +0100
Subject: [PATCH 1/3] Fix nullable checkbox

---
 .../schema-editing/edit-columns/edit-columns.component.html    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/views/schema-editing/edit-columns/edit-columns.component.html b/src/app/views/schema-editing/edit-columns/edit-columns.component.html
index 6482ca1a..fe222a24 100644
--- a/src/app/views/schema-editing/edit-columns/edit-columns.component.html
+++ b/src/app/views/schema-editing/edit-columns/edit-columns.component.html
@@ -30,9 +30,8 @@ <h5 *ngIf="entity()?.entityType !== EntityType.MATERIALIZED_VIEW">{{ entity()?.n
                                [attr.data-before]="col.name" id="colName" #editColName
                                [ngClass]="columnValidation(editColName.value, col.name)">
                     </td>
-
                     <td>
-                        <input cFormControl sizing="sm" type="checkbox" formControlName="nullable" id="nullable"
+                        <input cFormCheckInput sizing="sm" type="checkbox" formControlName="nullable" id="nullable"
                                [attr.data-before]="col.nullable" (change)="changeNullable()">
                     </td>
                     <td>

From c56588547d1e20ccd2d94a922ff911cf738d4591 Mon Sep 17 00:00:00 2001
From: Martin Vahlensieck <martin.vahlensieck@unibas.ch>
Date: Fri, 17 Jan 2025 16:32:02 +0100
Subject: [PATCH 2/3] Hide nullable checkbox for primary keys

---
 .../schema-editing/edit-columns/edit-columns.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/views/schema-editing/edit-columns/edit-columns.component.html b/src/app/views/schema-editing/edit-columns/edit-columns.component.html
index fe222a24..95ab884b 100644
--- a/src/app/views/schema-editing/edit-columns/edit-columns.component.html
+++ b/src/app/views/schema-editing/edit-columns/edit-columns.component.html
@@ -31,7 +31,7 @@ <h5 *ngIf="entity()?.entityType !== EntityType.MATERIALIZED_VIEW">{{ entity()?.n
                                [ngClass]="columnValidation(editColName.value, col.name)">
                     </td>
                     <td>
-                        <input cFormCheckInput sizing="sm" type="checkbox" formControlName="nullable" id="nullable"
+                        <input cFormCheckInput *ngIf="!col.primary" sizing="sm" type="checkbox" formControlName="nullable" id="nullable"
                                [attr.data-before]="col.nullable" (change)="changeNullable()">
                     </td>
                     <td>

From ab622befb283c46a19ca4ddf145e46364a975717 Mon Sep 17 00:00:00 2001
From: Martin Vahlensieck <martin.vahlensieck@unibas.ch>
Date: Fri, 17 Jan 2025 16:32:05 +0100
Subject: [PATCH 3/3] Set correct option in the collection type drop down

---
 .../schema-editing/edit-columns/edit-columns.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/views/schema-editing/edit-columns/edit-columns.component.html b/src/app/views/schema-editing/edit-columns/edit-columns.component.html
index 95ab884b..60b56809 100644
--- a/src/app/views/schema-editing/edit-columns/edit-columns.component.html
+++ b/src/app/views/schema-editing/edit-columns/edit-columns.component.html
@@ -43,8 +43,8 @@ <h5 *ngIf="entity()?.entityType !== EntityType.MATERIALIZED_VIEW">{{ entity()?.n
                     <td>
                         <select cSelect sizing="sm" id="collectionsType"
                                 [attr.data-before]="col.collectionsType" formControlName="collectionsType">
-                            <option value="">none</option>
-                            <option value="ARRAY">ARRAY</option>
+                            <option value="" [selected]="col.collectionsType === null">none</option>
+                            <option value="ARRAY" [selected]="col.collectionsType === 'ARRAY'">ARRAY</option>
                         </select>
                     </td>
                     <td class="data-type-parameters">