tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: ORDER BY in nested query does not work under MSSQL, remove

Browse Source
This commit is contained in:
Mateusz Uzdowski 2010-10-08 00:56:52 +00:00
parent a2e998ab79
commit cec87a859e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/submissions/SubmittedFormReportField.php
View File

@ -93,13 +93,11 @@ class SubmittedFormReportField extends FormField {
foreach($submissions as $submission) { foreach($submissions as $submission) {
$inClause[] = $submission->ID; $inClause[] = $submission->ID;
} }
$csvHeaders = DB::query("SELECT DISTINCT \"Name\" , \"Title\" FROM $csvHeaders = DB::query("SELECT \"Name\" , \"Title\" FROM \"SubmittedFormField\"
((
SELECT \"Name\" , \"Title\" FROM \"SubmittedFormField\"
LEFT JOIN \"SubmittedForm\" ON \"SubmittedForm\".\"ID\" = \"SubmittedFormField\".\"ParentID\" LEFT JOIN \"SubmittedForm\" ON \"SubmittedForm\".\"ID\" = \"SubmittedFormField\".\"ParentID\"
WHERE \"SubmittedFormField\".\"ParentID\" IN (" . implode(',', $inClause) . ") WHERE \"SubmittedFormField\".\"ParentID\" IN (" . implode(',', $inClause) . ")
ORDER BY \"SubmittedFormField\".\"ParentID\" DESC, \"SubmittedFormField\".\"ID\" ORDER BY \"SubmittedFormField\".\"ParentID\" DESC, \"SubmittedFormField\".\"ID\"
) AS \"tmp\")"); ");
if ($csvHeaders) $csvHeaders = $csvHeaders->map(); if ($csvHeaders) $csvHeaders = $csvHeaders->map();
if($submissions && $submissions->exists()) { if($submissions && $submissions->exists()) {

4
tests/SubmittedFormTest.php
View File

@ -69,6 +69,10 @@ class SubmittedFormTest extends FunctionalTest {
// check the number of records in the export // check the number of records in the export
$this->assertEquals(count($data), 12); $this->assertEquals(count($data), 12);
$this->assertEquals(count($data[1]), 4);
$this->assertEquals(count($data[2]), 4);
$this->assertEquals(count($data[11]), 4);
$this->assertEquals($data[1][1], 'quote " and comma , test'); $this->assertEquals($data[1][1], 'quote " and comma , test');
$this->assertEquals($data[1][2], 'Value 1'); $this->assertEquals($data[1][2], 'Value 1');
$this->assertEquals($data[2][1], 'Value 2'); $this->assertEquals($data[2][1], 'Value 2');