--- parser3/src/classes/array.C 2024/10/02 17:58:15 1.16 +++ 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.16 2024/10/02 17:58:15 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.19 2024/10/20 13:20:57 moko Exp $"; // class @@ -492,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); + ArrayValue& array=self.array(); - self.array().clear(); self.invalidate(); // just in case if called as method + 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){ @@ -525,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); @@ -552,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) @@ -857,6 +856,7 @@ static void _sort(Request& r, MethodPara for(pos=0; pos