Skip to content

Commit 603e030

Browse files
kinowmr-c
authored andcommitted
Fix table name in Query, and use TEXT instead of default JPA varchar(1000)
1 parent d4ff2b1 commit 603e030

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

src/main/java/org/commonwl/view/workflow/QueuedWorkflow.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ public class QueuedWorkflow extends BaseEntity implements Serializable {
3636
public String id;
3737

3838
// Very barebones workflow to build loading thumbnail and overview
39-
@Column(columnDefinition = "jsonb", length = 10000)
39+
@Column(columnDefinition = "jsonb")
4040
@Type(type = "json")
4141
@Convert(disableConversion = true)
4242
private Workflow tempRepresentation;
4343

4444
// List of packed workflows for packed workflows
4545
// TODO: Refactor so this is not necessary
46-
@Column(columnDefinition = "jsonb", length = 10000)
46+
@Column(columnDefinition = "jsonb")
4747
@Type(type = "json")
4848
@Convert(disableConversion = true)
4949
private List<WorkflowOverview> workflowList;
5050

5151
// Cwltool details
52-
@Column(columnDefinition = "jsonb", length = 10000)
52+
@Column(columnDefinition = "jsonb")
5353
@Type(type = "json")
5454
@Convert(disableConversion = true)
5555
private CWLToolStatus cwltoolStatus = CWLToolStatus.RUNNING;
56-
@Column(length = 1000)
56+
@Column(columnDefinition = "TEXT")
5757
private String cwltoolVersion = "";
58-
@Column(length = 1000)
58+
@Column(columnDefinition = "TEXT")
5959
private String message;
6060

6161
public String getId() {

src/main/java/org/commonwl/view/workflow/QueuedWorkflowRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface QueuedWorkflowRepository extends JpaRepository<QueuedWorkflow,
2020
* @param retrievedOn Date of when the queued workflow was retrieved
2121
* @return The number of queued workflows deleted
2222
*/
23-
@Query(value = "DELETE FROM queued_workflow q WHERE q.tempRepresentation ->> 'retrieved_on' <= ?1", nativeQuery = true)
23+
@Query(value = "DELETE FROM queued_workflow q WHERE q.temp_representation ->> 'retrieved_on' <= ?1", nativeQuery = true)
2424
Long deleteByTempRepresentation_RetrievedOnLessThanEqual(Date retrievedOn);
2525

2626
/**
@@ -29,7 +29,7 @@ public interface QueuedWorkflowRepository extends JpaRepository<QueuedWorkflow,
2929
* @param retrievedOn Details of where the queued workflow is from
3030
* @return A list of queued workflows
3131
*/
32-
@Query(value = "SELECT q.* FROM queued_workflow q WHERE q.tempRepresentation ->> 'retrieved_on' <= ?1", nativeQuery = true)
32+
@Query(value = "SELECT q.* FROM queued_workflow q WHERE q.temp_representation ->> 'retrieved_on' <= ?1", nativeQuery = true)
3333
List<QueuedWorkflow> findByTempRepresentation_RetrievedOnLessThanEqual(Date retrievedOn);
3434

3535
}

src/main/java/org/commonwl/view/workflow/Workflow.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class Workflow extends BaseEntity implements Serializable {
6767
public String id;
6868

6969
// Metadata
70-
@Column(columnDefinition = "jsonb", length = 10000)
70+
@Column(columnDefinition = "jsonb")
7171
@Type(type = "json")
7272
@Convert(disableConversion = true)
7373
private GitDetails retrievedFrom;
@@ -77,46 +77,46 @@ public class Workflow extends BaseEntity implements Serializable {
7777

7878
// The last commit from the branch at the time of fetching
7979
// Used for caching purposes
80-
@Column
80+
@Column(columnDefinition = "TEXT")
8181
private String lastCommit;
8282

8383
// A String which represents the path to a RO bundle
8484
// Path types cannot be stored using Spring Data, unfortunately
85-
@Column(length=1000)
85+
@Column(columnDefinition = "TEXT")
8686
private String roBundlePath;
8787

8888
// Contents of the workflow
89-
@Column(length=1000)
89+
@Column(columnDefinition = "TEXT")
9090
private String label;
91-
@Column(length=1000)
91+
@Column(columnDefinition = "TEXT")
9292
private String doc;
93-
@Column(columnDefinition = "jsonb", length = 10000)
93+
@Column(columnDefinition = "jsonb")
9494
@Type(type = "json")
9595
@Convert(disableConversion = true)
9696
private Map<String, CWLElement> inputs;
97-
@Column(columnDefinition = "jsonb", length = 10000)
97+
@Column(columnDefinition = "jsonb")
9898
@Type(type = "json")
9999
@Convert(disableConversion = true)
100100
private Map<String, CWLElement> outputs;
101-
@Column(columnDefinition = "jsonb", length = 10000)
101+
@Column(columnDefinition = "jsonb")
102102
@Type(type = "json")
103103
@Convert(disableConversion = true)
104104
private Map<String, CWLStep> steps;
105105

106106
// Currently only DockerRequirement is parsed for this
107-
@Column(length=1000)
107+
@Column(columnDefinition = "TEXT")
108108
private String dockerLink;
109109

110-
@Column(length=1000)
110+
@Column(columnDefinition = "TEXT")
111111
private String cwltoolVersion = "";
112112

113113
// DOT graph of the contents
114-
@Column(length=1000)
114+
@Column(columnDefinition = "TEXT")
115115
private String visualisationDot;
116116

117117
private static final String PERMANENT_LINK_BASE_URL = "https://w3id.org/cwl/view";
118118

119-
@Column(length=1000)
119+
@Column(columnDefinition = "TEXT")
120120
private String licenseLink;
121121

122122
public Workflow(String label, String doc, Map<String, CWLElement> inputs, Map<String, CWLElement> outputs,

0 commit comments

Comments
 (0)