Skip to content

Commit

Permalink
Fixed issue #4381: Variety of crashes with MS SQL DB
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8777 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Jun 2, 2010
1 parent 212603c commit 3c9d27c
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion admin/activate.php
View file
Expand Up @@ -96,7 +96,7 @@
{
if ($qtypes[$chkrow['type']]['subquestions']>0)
{
$chaquery = "SELECT * FROM {$dbprefix}questions WHERE parent_qid = {$chkrow['qid']} ORDER BY question_order, question";
$chaquery = "SELECT * FROM {$dbprefix}questions WHERE parent_qid = {$chkrow['qid']} ORDER BY question_order";
$charesult=$connect->Execute($chaquery);
$chacount=$charesult->RecordCount();
if ($chacount == 0)
Expand Down
24 changes: 12 additions & 12 deletions admin/dataentry.php
View file
Expand Up @@ -1695,7 +1695,7 @@ function saveshow(value)
break;
case "Q": //MULTIPLE SHORT TEXT
case "K":
$deaquery = "SELECT question,title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order, question";
$deaquery = "SELECT question,title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order";
$dearesult = db_execute_assoc($deaquery);
$dataentryoutput .= "\t<table>\n";
while ($dearow = $dearesult->FetchRow())
Expand All @@ -1710,7 +1710,7 @@ function saveshow(value)
break;

case "1": // multi scale^
$deaquery = "SELECT * FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$baselang}' ORDER BY question_order, question";
$deaquery = "SELECT * FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$baselang}' ORDER BY question_order";
$dearesult = db_execute_assoc($deaquery);
$dataentryoutput .='<table><tr><td></td><th>'.$clang->gT('Label 1').'</th><th>'.$clang->gT('Label 2').'</th></tr>';

Expand Down Expand Up @@ -2039,7 +2039,7 @@ function saveshow(value)
{
$dcols=0;
}
$meaquery = "SELECT title, question, default_value FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order, question";
$meaquery = "SELECT title, question, default_value FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order";
$mearesult = db_execute_assoc($meaquery);
$meacount = $mearesult->RecordCount();
if ($deqrow['other'] == "Y") {$meacount++;}
Expand Down Expand Up @@ -2154,7 +2154,7 @@ function saveshow(value)
$dataentryoutput .= "\t</select>\n";
break;
case "A": //ARRAY (5 POINT CHOICE) radio-buttons
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order, question";
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order";
$mearesult = db_execute_assoc($meaquery);
$dataentryoutput .= "<table>\n";
while ($mearow = $mearesult->FetchRow())
Expand All @@ -2175,7 +2175,7 @@ function saveshow(value)
$dataentryoutput .= "</table>\n";
break;
case "B": //ARRAY (10 POINT CHOICE) radio-buttons
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order, question";
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order";
$mearesult = db_execute_assoc($meaquery);
$dataentryoutput .= "<table>\n";
while ($mearow = $mearesult->FetchRow())
Expand All @@ -2196,7 +2196,7 @@ function saveshow(value)
$dataentryoutput .= "</table>\n";
break;
case "C": //ARRAY (YES/UNCERTAIN/NO) radio-buttons
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order, question";
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order";
$mearesult=db_execute_assoc($meaquery);
$dataentryoutput .= "<table>\n";
while ($mearow = $mearesult->FetchRow())
Expand All @@ -2216,7 +2216,7 @@ function saveshow(value)
$dataentryoutput .= "</table>\n";
break;
case "E": //ARRAY (YES/UNCERTAIN/NO) radio-buttons
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order, question";
$meaquery = "SELECT title, question FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order";
$mearesult=db_execute_assoc($meaquery) or safe_die ("Couldn't get answers, Type \"E\"<br />$meaquery<br />".$connect->ErrorMsg());
$dataentryoutput .= "<table>\n";
while ($mearow = $mearesult->FetchRow())
Expand Down Expand Up @@ -2271,7 +2271,7 @@ function saveshow(value)
$dataentryoutput .= "<table>\n";
$dataentryoutput .= " <tr><td></td>\n";
$labelcodes=array();
$lquery = "SELECT question, title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} and scale_id=1 and language='$language' ORDER BY question_order, question";
$lquery = "SELECT question, title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} and scale_id=1 and language='$language' ORDER BY question_order";
$lresult=db_execute_assoc($lquery) or die ("Couldn't get labels, Type \":\"<br />$lquery<br />".htmlspecialchars($connect->ErrorMsg()));
while ($data=$lresult->FetchRow())
{
Expand All @@ -2281,7 +2281,7 @@ function saveshow(value)

$dataentryoutput .= " </tr>\n";

$meaquery = "SELECT question, title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} and scale_id=0 and language='$language' ORDER BY question_order, question";
$meaquery = "SELECT question, title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} and scale_id=0 and language='$language' ORDER BY question_order";
$mearesult=db_execute_assoc($meaquery) or die ("Couldn't get answers, Type \":\"<br />$meaquery<br />".htmlspecialchars($connect->ErrorMsg()));
$i=0;
while ($mearow=$mearesult->FetchRow())
Expand Down Expand Up @@ -2324,7 +2324,7 @@ function saveshow(value)
case ";": //ARRAY (Multi Flexi)
$dataentryoutput .= "<table>\n";
$dataentryoutput .= " <tr><td></td>\n";
$lquery = "SELECT * FROM ".db_table_name("questions")." WHERE scale_id=1 and parent_qid={$deqrow['qid']} and language='$language' ORDER BY question_order, question";
$lquery = "SELECT * FROM ".db_table_name("questions")." WHERE scale_id=1 and parent_qid={$deqrow['qid']} and language='$language' ORDER BY question_order";
$lresult=db_execute_assoc($lquery) or die ("Couldn't get labels, Type \":\"<br />$lquery<br />".htmlspecialchars($connect->ErrorMsg()));
$labelcodes=array();
while ($data=$lresult->FetchRow())
Expand All @@ -2335,7 +2335,7 @@ function saveshow(value)

$dataentryoutput .= " </tr>\n";

$meaquery = "SELECT * FROM ".db_table_name("questions")." WHERE scale_id=0 and parent_qid={$deqrow['qid']} and language='$language' ORDER BY question_order, question";
$meaquery = "SELECT * FROM ".db_table_name("questions")." WHERE scale_id=0 and parent_qid={$deqrow['qid']} and language='$language' ORDER BY question_order";
$mearesult=db_execute_assoc($meaquery) or die ("Couldn't get answers, Type \":\"<br />$meaquery<br />".htmlspecialchars($connect->ErrorMsg()));
$i=0;
while ($mearow=$mearesult->FetchRow())
Expand Down Expand Up @@ -2366,7 +2366,7 @@ function saveshow(value)
break;
case "F": //ARRAY (Flexible Labels)
case "H":
$meaquery = "SELECT * FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} and language='$language' ORDER BY question_order, question";
$meaquery = "SELECT * FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} and language='$language' ORDER BY question_order";
$mearesult=db_execute_assoc($meaquery) or safe_die ("Couldn't get answers, Type \"E\"<br />$meaquery<br />".$connect->ErrorMsg());
$dataentryoutput .= "<table>\n";
while ($mearow = $mearesult->FetchRow())
Expand Down

0 comments on commit 3c9d27c

Please sign in to comment.