--- parser3/src/classes/array.C	2024/09/28 21:28:57	1.12
+++ parser3/src/classes/array.C	2024/10/20 13:20:57	1.19
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.12 2024/09/28 21:28:57 moko Exp $";
+volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.19 2024/10/20 13:20:57 moko Exp $";
 
 // class
 
@@ -46,10 +46,17 @@ static void _create_or_add(Request& r, M
 
 		if(VArray* src=dynamic_cast<VArray*>(&vsrc)) {
 			if(src==&self)
-				throw Exception(PARSER_RUNTIME, 0, "source and destination are the same array");
-			self_array.append(src->array());
+				return;
+			if(self_array.count()){
+				for(ArrayValue::Iterator i(src->array()); i; i.next()){
+					if(i.value())
+						self_array.put(i.index(), i.value());
+				}
+			} else {
+				self_array.append(src->array());
+			}
 		} else {
-			HashStringValue* src_hash=vsrc.get_hash();
+			HashStringValue* src_hash=vsrc.as_hash("param must be array or");
 			if(!src_hash)
 				return;
 			for(HashStringValue::Iterator i(*src_hash); i; i.next()){
@@ -119,7 +126,7 @@ static void _join(Request& r, MethodPara
 			}
 		}
 	} else {
-		HashStringValue* src_hash=vsrc.get_hash();
+		HashStringValue* src_hash=vsrc.as_hash("param must be array or");
 		if(!src_hash)
 			return;
 		if(o.defined){
@@ -445,6 +452,7 @@ static void _sql(Request& r, MethodParam
 	if(params.count()>1)
 		if(HashStringValue* options=params.as_hash(1, "sql options")) {
 			int valid_options=0;
+			bool distinct_specified=false;
 			for(HashStringValue::Iterator i(*options); i; i.next() ){
 				String::Body key=i.key();
 				Value* value=i.value();
@@ -459,6 +467,7 @@ static void _sql(Request& r, MethodParam
 					valid_options++;
 				} else if (key == sql_distinct_name) {
 					distinct=r.process(*value).as_bool();
+					distinct_specified=true;
 					valid_options++;
 				} else if (key == sql_value_type_name) {
 					value_type=get_value_type(r.process(*value));
@@ -470,6 +479,8 @@ static void _sql(Request& r, MethodParam
 			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+			if(distinct_specified && !sparse)
+				throw Exception(PARSER_RUNTIME, 0, "'distinct' option can only be used when $.sparse(true) is specified");
 		}
 
 	SQL_Driver::Placeholder* placeholders=0;
@@ -481,23 +492,25 @@ static void _sql(Request& r, MethodParam
 	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
 
 	VArray& self=GET_SELF(r, VArray);
-	
-	self.array().clear(); self.invalidate(); // just in case if called as method
+	ArrayValue& array=self.array();
+
+	array.clear(); self.invalidate(); // just in case if called as method
 
 	if(sparse){
-		SparseArray_sql_event_handlers handlers(distinct, self.array(), value_type);
+		SparseArray_sql_event_handlers handlers(distinct, array, value_type);
 		r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string);
 	} else {
-		Array_sql_event_handlers handlers(self.array(), value_type);
+		Array_sql_event_handlers handlers(array, value_type);
 		r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string);
 	}
 
+	array.confirm_all_used();
+
 	if(bind)
 		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 }
 
 
-
 static void mid(Request& r, size_t offset=0, size_t limit=ARRAY_OPTION_LIMIT_ALL) {
 	ArrayValue& array=GET_SELF(r, VArray).array();
 	if(limit>0){
@@ -514,6 +527,7 @@ static void mid(Request& r, size_t offse
 				result_array+=i.value();
 			}
 		}
+		result_array.confirm_all_used();
 		r.write(*result);
 	} else {
 		r.write(*new VArray);
@@ -541,15 +555,11 @@ static void _right(Request& r, MethodPar
 }
 
 static void _mid(Request& r, MethodParams& params) {
-	const String& string=GET_SELF(r, VString).string();
-
 	int begin=params.as_int(0, "p must be int", r);
+
 	if(begin<0)
 		throw Exception(PARSER_RUNTIME, 0,  "p(%d) must be >=0", begin);
 
-	size_t end;
-	size_t length=0;
-
 	if(params.count()>1) {
 		int n=params.as_int(1, "n must be int", r);
 		if(n<0)
@@ -846,6 +856,7 @@ static void _sort(Request& r, MethodPara
 		for(pos=0; pos<count; pos++)
 			array+=seq[pos].array_data;
 
+	self.invalidate();
 	delete[] seq;
 }
 
@@ -855,7 +866,7 @@ enum AtResultType {
 	AtResultTypeHash = 2
 };
 
-inline Value& SingleElementHash(String::Body akey, Value* avalue) {
+static Value& SingleElementHash(String::Body akey, Value* avalue) {
 	Value& result=*new VHash;
 	result.put_element(*new String(akey, String::L_TAINTED), avalue);
 	return result;
@@ -1006,10 +1017,11 @@ static void _select(Request& r, MethodPa
 		}
 	}
 
+	result_array.confirm_all_used();
 	r.write(*result);
 }
 
-static void _reverse(Request& r, MethodParams& params) {
+static void _reverse(Request& r, MethodParams&) {
 	ArrayValue& source_array=GET_SELF(r, VArray).array();
 
 	VArray& result=*new VArray(source_array.count());
@@ -1027,13 +1039,20 @@ static void _reverse(Request& r, MethodP
 
 MArray::MArray(): Methoded(VARRAY_TYPE) {
 
-	// ^array::create[[copy_from]]
-	add_native_method("create", Method::CT_DYNAMIC, _create_or_add, 0, 1);
+	// ^array::copy[[copy_from]]
+	add_native_method("copy", Method::CT_DYNAMIC, _create_or_add, 0, 1);
 	// ^array.add[add_from]
 	add_native_method("add", Method::CT_DYNAMIC, _create_or_add, 1, 1);
 	// ^array.join[join_from[;options]]
 	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);
 
+	// ^array::create[value;value]
+	add_native_method("create", Method::CT_DYNAMIC, _append, 0, 10000);
+	// ^array.append[value;value]
+	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 10000);
+	// ^array.insert[index;value...]
+	add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000);
+
 	// ^array.left(n)
 	add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
 	// ^array.right(n)
@@ -1042,13 +1061,6 @@ MArray::MArray(): Methoded(VARRAY_TYPE)
 	// ^array.mid(p;n)
 	add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);
 
-	// ^array::new[value;value]
-	add_native_method("new", Method::CT_DYNAMIC, _append, 0, 10000);
-	// ^array.append[value;value]
-	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 10000);
-	// ^array.insert[index;value...]
-	add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000);
-
 	// ^array.delete[index]
 	add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1);
 	// ^array.remove[index]
@@ -1088,7 +1100,7 @@ MArray::MArray(): Methoded(VARRAY_TYPE)
 #ifdef FEATURE_GET_ELEMENT4CALL
 	// aliases without "_"
 	add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1);
-	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);
+	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 1);
 	add_native_method("at", Method::CT_DYNAMIC, _at, 1, 2);
 #endif