Skip to content

Commit fccbd9c

Browse files
review
1 parent ab28bc5 commit fccbd9c

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

query/src/org/labkey/query/controllers/SqlController.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void set(String name, Object value)
9999

100100
public enum Format
101101
{
102-
split, // respose that can be parsed using String.split(), configure with 'sep' and 'eol'
102+
split, // response that can be parsed using String.split(), configure with 'sep' and 'eol'
103103

104104
compact, // same as split, but with ditto markers (cheap way to compress and save space on client)
105105

@@ -220,7 +220,7 @@ public void setCompact(boolean compact)
220220
/// Execute a LabKey SQL query and return results as plain text. Designed for lightweight programmatic access without the overhead of QueryView/JSON API responses.
221221
///
222222
/// Note this is still experimental as this API does not work well with some features.
223-
/// In particular, some columns rely on custom DisplayColumn implmentations to return meaningful data,
223+
/// In particular, some columns rely on custom DisplayColumn implementations to return meaningful data,
224224
/// and this code path does not use DisplayColumn. In particular group_concat result (e.g. multi-value foreign keys)
225225
/// may not render correctly, as well as lineage columns like MaterialInputs/*.
226226
@RequiresPermission(ReadPermission.class)
@@ -622,10 +622,13 @@ public void testExecute_mssql() throws Exception
622622
// Data rows ordered by Name
623623
assertEquals("Alice", tokens[9]);
624624
assertEquals("30", tokens[10]);
625+
assertEquals("95.5", tokens[11]);
625626
assertEquals("Bob", tokens[12]);
626627
assertEquals("30", tokens[13]);
628+
assertEquals("87.3", tokens[14]);
627629
assertEquals("Carol", tokens[15]);
628630
assertEquals("35", tokens[16]);
631+
assertEquals("91.0", tokens[17]);
629632
}
630633

631634
@Test
@@ -668,12 +671,15 @@ public void testExecute() throws Exception
668671
// Data rows ordered by Name (4 columns per row)
669672
assertEquals("Alice", tokens[11]);
670673
assertEquals("30", tokens[12]);
674+
assertEquals("95.5", tokens[13]);
671675
assertTrue("Alice Tags", tokens[14].contains("Red") && tokens[14].contains("Green"));
672676
assertEquals("Bob", tokens[15]);
673677
assertEquals("30", tokens[16]);
678+
assertEquals("87.3", tokens[17]);
674679
assertTrue("Bob Tags", tokens[18].contains("Blue"));
675680
assertEquals("Carol", tokens[19]);
676681
assertEquals("35", tokens[20]);
682+
assertEquals("91.0", tokens[21]);
677683
assertTrue("Carol Tags", tokens[22].contains("Red") && tokens[22].contains("Blue") && tokens[22].contains("Green"));
678684
}
679685

@@ -765,4 +771,4 @@ public void testSchemaNotFound() throws Exception
765771
response.getContentAsString().contains("schema not found"));
766772
}
767773
}
768-
}
774+
}

0 commit comments

Comments
 (0)