diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java index 4a6cfea52..c69b9ae86 100644 --- a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java +++ b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java @@ -530,7 +530,7 @@ private static final String replaceQueryForFifo(String query) { "str_user, " + "int_uid, " + "str_log_dir, " + - "str_os, " + + "COALESCE(str_os, '') AS str_os, " + "b_loki_enabled, " + "str_loki_url, " + "frame_name, " + diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java index ac73957f3..19a49f5b1 100644 --- a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java +++ b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java @@ -350,7 +350,7 @@ public DispatchFrame mapRow(ResultSet rs, int rowNum) throws SQLException { "job.str_user,"+ "job.int_uid,"+ "job.str_log_dir,"+ - "job.str_os,"+ + "COALESCE(str_os, '') AS str_os, " + "job.b_loki_enabled,"+ "job.str_loki_url,"+ "frame.str_name AS frame_name, "+ diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/NestedWhiteboardDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/NestedWhiteboardDaoJdbc.java index 8c920c5a4..fdd147ca1 100644 --- a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/NestedWhiteboardDaoJdbc.java +++ b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/NestedWhiteboardDaoJdbc.java @@ -94,7 +94,7 @@ public CachedJobWhiteboardMapper(NestedJobWhiteboardMapper result) { "job.b_paused, " + "job.b_autoeat, " + "job.b_comment, " + - "job.str_os, " + + "COALESCE(str_os, '') AS str_os, " + "job.int_frame_count, " + "job.int_layer_count, " + "job_stat.int_waiting_count, " + diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java index 2a597cfeb..0e24ed1c8 100644 --- a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java +++ b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java @@ -356,7 +356,7 @@ public VirtualProc mapRow(ResultSet rs, int rowNum) throws SQLException { "proc.int_virt_max_used,"+ "proc.int_virt_used,"+ "host.str_name AS host_name, " + - "job.str_os " + + "COALESCE(job.str_os, '') AS str_os " + "FROM " + "proc, " + "job, " + @@ -389,7 +389,7 @@ public VirtualProc findVirtualProc(FrameInterface frame) { "proc.*, " + "host.str_name AS host_name, " + "host.pk_alloc, " + - "job.str_os, " + + "COALESCE(job.str_os, '') AS str_os, " + "alloc.pk_facility " + "FROM " + "proc, " + @@ -530,7 +530,7 @@ public String getCurrentFrameId(ProcInterface p) { "SELECT " + "proc.*, " + "host.str_name AS host_name, " + - "job.str_os, " + + "COALESCE(job.str_os, '') AS str_os, " + "host.pk_alloc, " + "alloc.pk_facility " + "FROM " +