- PostgreSQL 9.2 compatibility fixes

  related to <sequence>.nextval

www/admin/question-add-3-postgresql.xql

@@ -27,7 +27,7 @@
  
 <fullquery name="get_choice_id">      
       <querytext>
-      select survsimp_choice_id_sequence.nextval as choice_id 
+      select nextval('survsimp_choice_id_seq') as choice_id from dual
       </querytext>
 </fullquery>
 

www/admin/question-add-3.tcl

@@ -126,7 +126,7 @@ if { $type == "scored" } {
 	set count 0
 	foreach response $responses {
 	    set trimmed_response [string trim $response]
-	    set choice_id [db_string get_choice_id "select survsimp_choice_id_sequence.nextval as choice_id from dual"]
+	    set choice_id [db_string get_choice_id "select nextval('survsimp_choice_id_seq') as choice_id from dual"]
 	    db_dml insert_survsimp_question_choice "
 		insert into survsimp_question_choices
                 (choice_id, question_id, label, sort_order)
@@ -226,9 +226,9 @@ if { $type == "scored" } {
 		            continue
 		        }
 		        ### added this next line to 
-	    	        set choice_id [db_string get_choice_id "select survsimp_choice_id_sequence.nextval as choice_id from dual"]
+	    	        set choice_id [db_string get_choice_id "select nextval('survsimp_choice_id_seq') as choice_id from dual"]
 		        db_dml insert_survsimp_question_choice "insert into survsimp_question_choices (choice_id, question_id, label, sort_order)
-values (survsimp_choice_id_sequence.nextval, :question_id, :trimmed_response, :count)"
+values (nextval('survsimp_choice_id_seq'), :question_id, :trimmed_response, :count)"
 		        incr count
 	            }
 	        }

www/admin/survey-category-add-postgresql.xql

@@ -5,8 +5,7 @@
 
 <fullquery name="category_id_next_sequence">      
       <querytext>
-      select 
-  category_id_sequence.nextval 
+      select category_id_sequence.nextval 
       </querytext>
 </fullquery>
 

www/admin/survey-create-2-postgresql.xql

@@ -27,14 +27,14 @@
  
 <fullquery name="next_variable_id">      
       <querytext>
-      select survsimp_variable_id_sequence.nextval 
+      select nextval('survsimp_variable_id_seq') from dual
       </querytext>
 </fullquery>
 
  
 <fullquery name="next_logic_id">      
       <querytext>
-      select survsimp_logic_id_sequence.nextval 
+      select nextval('survsimp_logic_id_seq') from dual
       </querytext>
 </fullquery>
 

www/admin/survey-create-2.tcl

@@ -118,7 +118,7 @@ if {$checked_p == "f"} {
 
 	    foreach variable_name [split $variable_names ","] {
 	    
-		set variable_id [db_string next_variable_id "select survsimp_variable_id_sequence.nextval from dual"]
+		set variable_id [db_string next_variable_id "select nextval('survsimp_variable_id_seq') from dual"]
 
 		db_dml add_variable_name "insert into survsimp_variables
                   (variable_id, variable_name)
@@ -131,7 +131,7 @@ if {$checked_p == "f"} {
                   (:variable_id, :survey_id)"
 	    }
 
-	    set logic_id [db_string next_logic_id "select survsimp_logic_id_sequence.nextval from dual"]
+	    set logic_id [db_string next_logic_id "select nextval('survsimp_logic_id_seq') from dual"]
 	    db_dml add_logic "insert into survsimp_logic
               (logic_id, logic)
               values