From bb3240254b453003e25d612a9337cf73d79f5666 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sun, 18 Feb 2024 02:44:56 +0100
Subject: [PATCH] TST: fix unit tests
---
.../implementation/MySQL/MySQLInsertFSODescriptor.java | 4 ++--
.../database/backend/implementation/MySQL/MySQLListFiles.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertFSODescriptor.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertFSODescriptor.java
index c3f1cf34..bfa02d13 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertFSODescriptor.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertFSODescriptor.java
@@ -41,9 +41,9 @@ public class MySQLInsertFSODescriptor extends MySQLTransaction implements Insert
}
insertFilePropsStmt.setString(6, entity.filePath.toString());
if (entity.fileParentId != null) {
- insertFilePropsStmt.setInt(7, entity.fileParentId);
+ insertFilePropsStmt.setString(7, entity.fileParentId);
} else {
- insertFilePropsStmt.setNull(7, Types.INTEGER);
+ insertFilePropsStmt.setNull(7, Types.VARCHAR);
}
if (entity.fileType == ObjectType.DIRECTORY) {
insertFilePropsStmt.setString(8, "inode/directory");
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListFiles.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListFiles.java
index 99b9ca83..cc087663 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListFiles.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListFiles.java
@@ -30,11 +30,11 @@ class LiveFSODescriptor extends FSODescriptor {
// resolve here and now
children = new LinkedList<VirtualFSODescriptorInterface>();
try {
- pstmt.setInt(1, getEntityId().toInteger());
+ pstmt.setString(1, getEntityId().toString());
try (ResultSet rs = pstmt.executeQuery()) {
while (rs.next()) {
final SparseEntity entity = new SparseEntity();
- entity.id = rs.getInt("FileId");
+ entity.id = rs.getString("FileId");
DatabaseUtils.parseFSODescriptorFields(rs, entity);
children.add(new LiveFSODescriptor(entity, pstmt));
}
--
GitLab