--- parser3/src/classes/table.C 2020/12/17 19:51:21 1.355 +++ parser3/src/classes/table.C 2024/10/05 18:05:23 1.367 @@ -1,8 +1,8 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_config_includes.h" @@ -24,8 +24,9 @@ #include "pa_sql_connection.h" #include "pa_vbool.h" #include "pa_array.h" +#include "pa_varray.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.355 2020/12/17 19:51:21 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.367 2024/10/05 18:05:23 moko Exp $"; // class @@ -69,19 +70,22 @@ static Table::Action_options get_action_ result.offset=source.current(); else throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression"); - } else - result.offset=r.process(*voffset).as_int(); + } else { + int offset=r.process(*voffset).as_int(); + result.offset=offset < 0 ? 0 : offset; + } } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; - result.limit=r.process(*vlimit).as_int(); + int limit=r.process(*vlimit).as_int(); + result.limit=limit < 0 ? 0: limit; } - if(Value *vreverse=(Value *)options->get(table_reverse_name)) { + if(Value *vreverse=(Value *)options->get(table_reverse_name)) { valid_options++; result.reverse=r.process(*vreverse).as_bool(); if(result.reverse && !defined_offset) result.offset=source.count()-1; - } + } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); @@ -256,9 +260,9 @@ static void _create(Request& r, MethodPa if(params.count()>1) { if(params[0].is_string()){ // can be nameless only - const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction"); + const String& snameless=params.as_string(0, "called with more than 1 param, first param may be only string 'nameless' or junction"); if(snameless!="nameless") - throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more then 1 param, first param may be only 'nameless'"); + throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more than 1 param, first param may be only 'nameless'"); nameless=true; data_param_index++; } @@ -485,15 +489,15 @@ static void table_to_csv(pa_stringstream if(output_column_names) { if(table.columns()) { // named table if(control_chars.encloser){ - for(Array_iterator i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { enclose( result, i.next(), control_chars.encloser ); - if(i.has_next()) + if(i) result< i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { result<cstr(); - if(i.has_next()) + if(i) result< i(table); if(control_chars.encloser){ - while(i.has_next()) { - for(Array_iterator c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { enclose( result, c.next(), control_chars.encloser ); - if(c.has_next()) + if(c) result< c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { result<cstr(); - if(c.has_next()) + if(c) result< i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { enclose( result, i.next(), control_chars.encloser, control_chars.sencloser ); - if(i.has_next()) + if(i) result<<*control_chars.sseparator; } } else { - for(Array_iterator i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { result<<*i.next(); - if(i.has_next()) + if(i) result<<*control_chars.sseparator; } } @@ -580,9 +584,9 @@ static void table_to_csv(String& result, if(int lsize=table.count()?table[0]->count():0) for(int column=0; column i(table); if(control_chars.encloser){ - while(i.has_next()) { - for(Array_iterator c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { enclose( result, c.next(), control_chars.encloser, control_chars.sencloser ); - if(c.has_next()) + if(c) result<<*control_chars.sseparator; } result.append_know_length("\n", 1, String::L_CLEAN); } } else { - while(i.has_next()) { - for(Array_iterator c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { result<<*c.next(); - if(c.has_next()) + if(c) result<<*control_chars.sseparator; } result.append_know_length("\n", 1, String::L_CLEAN); @@ -821,7 +825,7 @@ static void table_row_to_hash(Table::ele Value& sv_processed=info->r->process(*info->key_code); key=&sv_processed.as_string(); } else { - key=info->key_fieldcount()?row->get(info->key_field):0; + key=info->key_field < row->count() ? row->get(info->key_field) : 0; } if(!key) @@ -841,12 +845,18 @@ static void table_row_to_hash(Table::ele case C_HASH: { VHash* vhash=new VHash; HashStringValue& hash=vhash->hash(); - for(Array_iterator i(*info->value_fields); i.has_next(); ) { - size_t value_field=i.next(); - if(value_fieldcount()) - hash.put(*info->table->columns()->get(value_field), new VString(*row->get(value_field))); + Table::columns_type columns=info->table->columns(); + if(info->value_fields){ // selected fields (can be empty) + for(Array_iterator i(*info->value_fields); i; ) { + size_t value_field=i.next(); + if(value_fieldcount()) + hash.put(columns ? *columns->get(value_field) : String(pa_uitoa(value_field)), new VString(*row->get(value_field))); + } + } else { // all fields + for(size_t index=0; indexcount(); index++) { + hash.put(columns && index < columns->count() ? *columns->get(index) : String(pa_uitoa(index)), new VString(*row->get(index))); + } } - exist=info->hash->put_dont_replace(*key, vhash); break; } @@ -912,96 +922,113 @@ static Table2hash_distint get_distinct(V static void _hash(Request& r, MethodParams& params) { Table& self_table=GET_SELF(r, VTable).table(); VHash& result=*new VHash; - if(Table::columns_type columns=self_table.columns()){ - if(columns->count()>0) { - Table2hash_distint distinct=D_ILLEGAL; - Table2hash_value_type value_type=C_HASH; - int param_index=params.count()-1; - if(param_index>0) { - - if(params[1].get_junction()) - value_type=C_CODE; - - if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error - --param_index; - int valid_options=0; - if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ? - valid_options++; - distinct=get_distinct(r.process(*vdistinct_code), value_type); - } - if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ? - if(value_type==C_TABLE) // $.distinct[tables] already was specified - throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together"); - if(value_type==C_CODE) - throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code"); - valid_options++; - value_type=get_value_type(r.process(*vvalue_type_code)); - } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); - } + Table2hash_distint distinct=D_ILLEGAL; + Table2hash_value_type value_type=C_HASH; + + int param_index=params.count()-1; + if(param_index>0) { + if(params[1].get_junction()) + value_type=C_CODE; + + if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error + --param_index; + int valid_options=0; + if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ? + valid_options++; + distinct=get_distinct(r.process(*vdistinct_code), value_type); + } + if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ? + if(value_type==C_TABLE) // $.distinct[tables] already was specified + throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together"); + if(value_type==C_CODE) + throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code"); + valid_options++; + value_type=get_value_type(r.process(*vvalue_type_code)); } - if(param_index==2) // options were specified but not as hash - throw Exception(PARSER_RUNTIME, 0, "options must be hash"); + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + } - Array value_fields; - Value* value_code=0; + if(param_index==2) // options were specified but not as hash + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); - if(param_index==0){ // list of columns wasn't specified - if(value_type==C_STRING) // $.type[string] - throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]"); - - for(size_t i=0; icount(); i++) // by all columns, including key - value_fields+=i; - - } else { // list of columns or code was specified - if(value_type==C_TABLE) - throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]"); - - Value& value_fields_param=params[1]; - if(value_fields_param.get_junction()){ // code specified - value_code=&value_fields_param; - } else if(value_fields_param.is_string()) { // one column as string was specified - const String &field_name=*value_fields_param.get_string(); - if(!field_name.is_empty()) - value_fields+=self_table.column_name2index(field_name, true); - } else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table - for(Array_iterator i(*value_fields_table); i.has_next(); ) { - const String& value_field_name =*i.next()->get(0); - value_fields +=self_table.column_name2index(value_field_name, true); - } - } else - throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code"); + bool value_all=false; + Array value_fields; + Value* value_code=0; + + if(param_index==0){ // list of columns wasn't specified + if(value_type==C_STRING) + throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]"); + + value_all=true; // all columns, including key + } else { // list of columns or code was specified + if(value_type==C_TABLE) + throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]"); + + Value& value_fields_param=params[1]; + if(value_fields_param.get_junction()){ // code specified + value_code=&value_fields_param; + } else if(value_fields_param.is_string()) { // one column as string was specified + const String &field_name=*value_fields_param.get_string(); + if(!field_name.is_empty()) + value_fields+=self_table.column_name2index(field_name, true); + } else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table + for(Array_iterator i(*value_fields_table); i; ) { + const String& value_field_name =*i.next()->get(0); + value_fields +=self_table.column_name2index(value_field_name, true); } + } else + throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code"); + + if(value_type==C_STRING && value_fields.count()>1) + throw Exception(PARSER_RUNTIME, 0, "you can't specify more than one value field with option $.type[string]"); + } - if(value_type==C_STRING && value_fields.count()>1) - throw Exception(PARSER_RUNTIME, 0, "you can't specify more then one value field with option $.type[string]"); + Value* key_param=¶ms[0]; + Row_info info={ + &r, + &self_table, + /*key_code=*/key_param->get_junction() ? key_param : 0, + /*key_field=*/0/*filled below*/, + value_all ? NULL : &value_fields, + value_code, + &result.hash(), + distinct, + /*row=*/0, + value_type + }; + info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true)); + + int saved_current=self_table.current(); + self_table.for_each(table_row_to_hash, &info); + self_table.set_current(saved_current); - { - Value* key_param=¶ms[0]; - Row_info info={ - &r, - &self_table, - /*key_code=*/key_param->get_junction() ? key_param : 0, - /*key_field=*/0/*filled below*/, - &value_fields, - value_code, - &result.hash(), - distinct, - /*row=*/0, - value_type - }; - info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true)); - - int saved_current=self_table.current(); - self_table.for_each(table_row_to_hash, &info); - self_table.set_current(saved_current); + result.extract_default(); - result.extract_default(); - } - } + r.write(result); +} + +static void _cells(Request& r, MethodParams& params) { + Table& self_table=GET_SELF(r, VTable).table(); + size_t row_size=self_table[self_table.current()]->count(); // number of columns in current row + + if(params.count()){ + int limit=params.as_int(params.count()-1, "offset must be expression", r); + if(limit<0) + limit=0; + if(limit i(*source_columns); i.has_next(); ) { + for(Array_iterator i(*source_columns); i; ) { Table::element_type result_row(new ArrayString); *result_row+=i.next(); result_table+=result_row; @@ -1439,6 +1466,7 @@ static void _columns(Request& r, MethodP } static void _select(Request& r, MethodParams& params) { + InCycle temp(r); Value& vcondition=params.as_expression(0, "condition must be number, bool or expression"); Table& source_table=GET_SELF(r, VTable).table(); @@ -1481,6 +1509,9 @@ static void _select(Request& r, MethodPa bool condition=r.process(vcondition).as_bool(); + if(r.check_skip_break()) + break; + if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result result_table+=source_table[row]; if(row==0) break; @@ -1491,6 +1522,9 @@ static void _select(Request& r, MethodPa bool condition=r.process(vcondition).as_bool(); + if(r.check_skip_break()) + break; + if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result result_table+=source_table[row]; } @@ -1501,6 +1535,42 @@ static void _select(Request& r, MethodPa r.write(*new VTable(&result_table)); } + +static void _rename(Request& r, MethodParams& params) { + const String* name_from=NULL; + const String* name_to=NULL; + HashStringValue* names=NULL; + + if(params.count()>1){ + name_from=¶ms.as_string(0, COLUMN_NAME_MUST_BE_STRING); + name_to=¶ms.as_string(1, COLUMN_NAME_MUST_BE_STRING); + } else + names=params.as_hash(0); + + Table& table=GET_SELF(r, VTable).table(); + if(Table::columns_type columns=table.columns()) { + if(names){ + for(int i=0; icount(); i++) { + const String *column = columns->get(i); + if(Value* vto=names->get(*column)){ + if(const String *sto=vto->get_string()) + columns->put(i, sto); + else + throw Exception(PARSER_RUNTIME, column, COLUMN_NAME_MUST_BE_STRING); + } + } + } else if(name_from){ + for(int i=0; icount(); i++) { + const String *column = columns->get(i); + if(*column == *name_from) + columns->put(i, name_to); + } + } + table.column_names_init(); + } else + throw Exception(PARSER_RUNTIME, 0, "columns renaming is not supported for nameless tables"); +} + // constructor MTable::MTable(): Methoded("table") { @@ -1548,6 +1618,10 @@ MTable::MTable(): Methoded("table") { // ^table.hash[key field name][value field name(s) string/table] add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3); + // ^table.cells[] + // ^table.cells(limit) + add_native_method("cells", Method::CT_DYNAMIC, _cells, 0, 1); + // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc] // ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc] add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2); @@ -1584,4 +1658,8 @@ MTable::MTable(): Methoded("table") { // ^table.select(expression) = table add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2); + + // ^table.rename[column name from;column name to] + // ^table.rename[ $.[column name from][column name to] ... ] + add_native_method("rename", Method::CT_DYNAMIC, _rename, 1, 2); }