--- parser3/src/classes/hash.C	2017/05/17 14:22:11	1.142
+++ parser3/src/classes/hash.C	2019/09/11 15:26:08	1.145
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.142 2017/05/17 14:22:11 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.145 2019/09/11 15:26:08 moko Exp $";
 
 // class
 
@@ -37,7 +37,6 @@ DECLARE_CLASS_VAR(hash, new MHash);
 
 #ifndef DOXYGEN
 class Hash_sql_event_handlers: public SQL_Driver_query_event_handlers {
-	const String& statement_string; const char* statement_cstr;
 	bool distinct;
 	HashStringValue& rows_hash;
 	Value* row_value;
@@ -50,15 +49,7 @@ class Hash_sql_event_handlers: public SQ
 public:
 	Table* empty;
 public:
-	Hash_sql_event_handlers(
-		const String& astatement_string,
-		const char* astatement_cstr,
-		bool adistinct,
-		HashStringValue& arows_hash,
-		Table2hash_value_type avalue_type)
-	: 
-		statement_string(astatement_string),
-		statement_cstr(astatement_cstr),
+	Hash_sql_event_handlers(bool adistinct, HashStringValue& arows_hash, Table2hash_value_type avalue_type):
 		distinct(adistinct),
 		rows_hash(arows_hash),
 		row_value(0),
@@ -81,13 +72,13 @@ public:
 
 	bool before_rows(SQL_Error& error) { 
 		if(columns.count()<1) {
-			error=SQL_Error(PARSER_RUNTIME, "no columns");
+			error=SQL_Error("no columns");
 			return true;
 		}
 		switch(value_type){
 			case C_STRING: {
 				if(columns.count()>2){
-					error=SQL_Error(PARSER_RUNTIME, "only 2 columns allowed for $.type[string].");
+					error=SQL_Error("only 2 columns allowed for $.type[string].");
 					return true;
 				}
 			}
@@ -110,7 +101,7 @@ public:
 
 	bool add_row_cell(SQL_Error& error, const char *str, size_t ) {
 		try {
-			const String& cell=str?*new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):String::Empty;
+			const String& cell=str ? *new String(str, String::L_TAINTED /* no length as 0x00 can be inside */) : String::Empty;
 
 			bool duplicate=false;
 			if(one_bool_column) {
@@ -173,7 +164,7 @@ public:
 			}
 
 			if(duplicate & !distinct) {
-				error=SQL_Error(PARSER_RUNTIME, "duplicate key");
+				error=SQL_Error("duplicate key");
 				return true;
 			}
 
@@ -284,12 +275,6 @@ static void _intersects(Request& r, Meth
 }
 
 
-extern String sql_bind_name;
-extern String sql_limit_name;
-extern String sql_offset_name;
-extern String sql_default_name;
-extern String sql_distinct_name;
-extern String sql_value_type_name;
 extern Table2hash_value_type get_value_type(Value& vvalue_type);
 extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders);
 extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders);
@@ -338,19 +323,10 @@ static void _sql(Request& r, MethodParam
 	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
 
 	HashStringValue& hash=GET_SELF(r, VHashBase).hash();
-	hash.clear();	
-	Hash_sql_event_handlers handlers(
-		statement_string, statement_cstr, 
-		distinct,
-		hash,
-		value_type);
-
-	r.connection()->query(
-		statement_cstr, 
-		placeholders_count, placeholders,
-		offset, limit,
-		handlers,
-		statement_string);
+	hash.clear();
+	Hash_sql_event_handlers handlers(distinct, hash, value_type);
+
+	r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string);
 
 	if(bind)
 		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
@@ -467,7 +443,7 @@ inline Value& SingleElementHash(String::
 }
 
 #ifndef DOXYGEN
-struct Hash_seq_item {
+struct Hash_seq_item : public PA_Allocated {
 	HashStringValue::Pair *hash_pair;
 	union {
 		const char *c_str;
@@ -505,7 +481,7 @@ static void _sort(Request& r, MethodPara
 	HashStringValue& hash=GET_SELF(r, VHashBase).hash();
 	int count=hash.count();
 
-	Hash_seq_item* seq=new(PointerFreeGC) Hash_seq_item[count];
+	Hash_seq_item* seq=new Hash_seq_item[count];
 	int pos=0;
 	bool key_values_are_strings=true;