--- parser3/src/classes/table.C 2007/03/14 10:57:52 1.224 +++ parser3/src/classes/table.C 2008/02/14 09:10:24 1.239 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2007/03/14 10:57:52 $"; +static const char * const IDENT_TABLE_C="$Date: 2008/02/14 09:10:24 $"; #include using namespace std; @@ -41,11 +41,6 @@ DECLARE_CLASS_VAR(table, new MTable, 0); extern String cycle_data_name; -// defines for globals - -#define SQL_BIND_NAME "bind" -#define SQL_DEFAULT_NAME "default" -#define SQL_DISTINCT_NAME "distinct" #define TABLE_REVERSE_NAME "reverse" // globals @@ -55,6 +50,7 @@ String sql_limit_name(PA_SQL_LIMIT_NAME) String sql_offset_name(PA_SQL_OFFSET_NAME); String sql_default_name(SQL_DEFAULT_NAME); String sql_distinct_name(SQL_DISTINCT_NAME); +String sql_value_type_name(SQL_VALUE_TYPE_NAME); String table_reverse_name(TABLE_REVERSE_NAME); // methods @@ -94,7 +90,7 @@ static Table::Action_options get_action_ if(soffset == "cur") result.offset=source.current(); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression"); } else @@ -112,7 +108,7 @@ static Table::Action_options get_action_ } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); @@ -122,11 +118,43 @@ static void check_option_param(bool opti MethodParams& params, size_t next_param_index, const char *msg) { if(next_param_index+(options_defined?1:0) != params.count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "%s", msg); } +struct TableSeparators { + char column; const String* scolumn; + char encloser; const String* sencloser; + + TableSeparators(): + column('\t'), scolumn(new String("\t", false)), + encloser(0), sencloser(0) + {} + int load( HashStringValue& options ) { + int result=0; + if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) { + scolumn=&vseparator->as_string(); + if(scolumn->length()!=1) + throw Exception(PARSER_RUNTIME, + scolumn, + "separator must be one character long"); + column=scolumn->first_char(); + result++; + } + if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) { + sencloser=&vencloser->as_string(); + if(sencloser->length()!=1) + throw Exception(PARSER_RUNTIME, + sencloser, + "encloser must be one character long"); + encloser=sencloser->first_char(); + result++; + } + return result; + } +}; + static void _create(Request& r, MethodParams& params) { // clone/copy part? if(Table *source=params[0].get_table()) { @@ -137,20 +165,49 @@ static void _create(Request& r, MethodPa return; } - // data is last parameter + size_t data_param_index=0; + bool nameless=false; + + 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"); + if(snameless!="nameless") + throw Exception(PARSER_RUNTIME, + &snameless, + "table::create called with more then 1 param, first param may be only 'nameless'"); + nameless=true; + data_param_index++; + } + } + + HashStringValue *options=0; + TableSeparators separators; + + size_t options_param_index=data_param_index+1; + if( + options_param_indexsplit(*columns, col_pos_after, "\t", String::L_AS_IS); + head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS); } } @@ -177,7 +234,7 @@ static void _create(Request& r, MethodPa continue; size_t col_pos_after=0; - string.split(*row, col_pos_after, "\t", String::L_AS_IS); + string.split(*row, col_pos_after, *separators.scolumn, String::L_AS_IS); table+=row; } @@ -267,40 +324,8 @@ static void skip_empty_and_comment_lines } } -struct TableSeparators { - char column; const String* scolumn; - char encloser; const String* sencloser; - - TableSeparators(): - column('\t'), scolumn(new String("\t", false)), - encloser(0), sencloser(0) - {} - int load( HashStringValue& options ) { - int result=0; - if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) { - scolumn=&vseparator->as_string(); - if(scolumn->length()!=1) - throw Exception("parser.runtime", - scolumn, - "separator must be one character long"); - column=scolumn->first_char(); - result++; - } - if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) { - sencloser=&vencloser->as_string(); - if(sencloser->length()!=1) - throw Exception("parser.runtime", - sencloser, - "encloser must be one character long"); - encloser=sencloser->first_char(); - result++; - } - return result; - } -}; - static void _load(Request& r, MethodParams& params) { - const String& first_param=params.as_string(0, "file name must be string"); + const String& first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING); int filename_param_index=0; bool nameless=first_param=="nameless"; if(nameless) @@ -318,7 +343,7 @@ static void _load(Request& r, MethodPara // loading text char *data=file_read_text(r.charsets, - r.absolute(params.as_string(filename_param_index, "file name must be string")), + r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options ); @@ -402,9 +427,9 @@ void maybe_enclose( ostringstream& to, c to<count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "invalid option passed"); } else { - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "additional params must be hash (did you spell mode parameter correctly?)"); } } } if(param_indexcount()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "invalid option passed"); } else { - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "additional params must be hash (did you spell mode parameter correctly?)"); } } } if(param_indexcount():0) for(int column=0; columntable->set_current(info->row++); // change context row StringOrValue sv_processed=info->r->process(*info->key_code); key=&sv_processed.as_string(); - } else + } else { key=info->key_fieldcount()?row->get(info->key_field):0; + } if(!key) return; // ignore rows without key [too-short-record_array if-indexed] - switch(info->distinct) { - case D_ILLEGAL: case D_FIRST: + bool exist = false; + switch (info->value_type) { + case C_STRING: + { + exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0)))); + } + break; + case C_HASH: { VHash* vhash=new VHash; HashStringValue& hash=vhash->hash(); @@ -675,20 +712,21 @@ static void table_row_to_hash(Table::ele new VString(*row->get(value_field))); } - if(info->hash->put_dont_replace(*key, vhash)) // put. existed? - if(info->distinct==D_ILLEGAL) - throw Exception("parser.runtime", - key, - "duplicate key"); + exist=info->hash->put_dont_replace(*key, vhash); } break; - case D_TABLES: + case C_TABLE: { VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed? + if( info->distinct==D_ILLEGAL ){ + exist=true; + break; + } + Table* table; - if(vtable) + if(vtable) { table=vtable->get_table(); - else { + } else { // no? creating table of same structure as source Table::Action_options table_options(0, 0); table=new Table(*info->table, table_options/*no rows, just structure*/); @@ -697,78 +735,119 @@ static void table_row_to_hash(Table::ele *table+=row; } break; - default: - throw Exception(0, + } + if(exist && info->distinct==D_ILLEGAL) + throw Exception(PARSER_RUNTIME, + key, + "duplicate key"); +} + +Table2hash_value_type get_value_type(Value& vvalue_type){ + if(vvalue_type.is_string()) { + const String& svalue_type=*vvalue_type.get_string(); + if(svalue_type == "table"){ + return C_TABLE; + } else if (svalue_type == "string") { + return C_STRING; + } else if (svalue_type == "hash") { + return C_HASH; + } else { + throw Exception(PARSER_RUNTIME, + &svalue_type, + "must be 'hash', 'table' or 'string'"); + } + } else { + throw Exception(PARSER_RUNTIME, 0, - "invalid distinct code (#%d)", info->distinct); + "'type' must be hash"); } } + 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(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(HashStringValue* options= - params.as_no_junction(param_index, "param must not be code").get_hash()) { + if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified --param_index; int valid_options=0; - if(Value* vdistinct_code=options->get(sql_distinct_name)) { + if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ? valid_options++; Value& vdistinct_value=r.process_to_value(*vdistinct_code); if(vdistinct_value.is_string()) { const String& sdistinct=*vdistinct_value.get_string(); - if(sdistinct=="tables") - distinct=D_TABLES; - else - throw Exception("parser.runtime", + if(sdistinct=="tables") { + value_type=C_TABLE; + distinct=D_FIRST; + } else { + throw Exception(PARSER_RUNTIME, &sdistinct, "must be 'tables' or true/false"); - } else + } + } else { distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL; + } } + 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"); + + valid_options++; + value_type=get_value_type(r.process_to_value(*vvalue_type_code)); + } + if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } } - if(param_index==2) // bad options param type - throw Exception("parser.runtime", + + if(param_index==2) // options was specified but not as hash + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); Array value_fields; - if(param_index>0) { - if(distinct!=D_ILLEGAL && distinct!=D_FIRST) - throw Exception("parser.runtime", + 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 was specified + if(value_type==C_TABLE) + throw Exception(PARSER_RUNTIME, 0, - "in distinct[tables] mode you may not specify value field(s)"); + "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]"); + Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code"); - if(value_fields_param.is_string()) { - value_fields+=self_table.column_name2index( - *value_fields_param.get_string(), true); - } else if(Table* value_fields_table=value_fields_param.get_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); + if(value_fields_param.is_string()) { // one column as string was specified + value_fields+=self_table.column_name2index(*value_fields_param.get_string(), 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", + throw Exception(PARSER_RUNTIME, 0, - "value field(s) must be string or table" - ); - } else { // by all columns, including key - if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST)) - for(size_t i=0; icount(); i++) - value_fields+=i; + "value field(s) must be string or table"); } + if(value_type==C_STRING && value_fields.count()!=1) + throw Exception(PARSER_RUNTIME, + 0, + "you can specify only one value field with option $.type[string]"); { Value* key_param=¶ms[0]; @@ -780,7 +859,8 @@ static void _hash(Request& r, MethodPara &value_fields, &result.hash(), distinct, - /*row=*/0 + /*row=*/0, + value_type }; info.key_field=(info.key_code?-1 :self_table.column_name2index(key_param->as_string(), true)); @@ -792,6 +872,7 @@ static void _hash(Request& r, MethodPara result.extract_default(); } } + } r.write_no_lang(result); } @@ -886,7 +967,7 @@ static bool _locate_name_value(Table& ta check_option_param(o.defined, params, 2, "locate by locate by name has parameters: name, value and, maybe, options"); const String& name=params.as_string(0, "column name must be string"); - const String& value=params.as_string(1, "value must be string"); + const String& value=params.as_string(1, VALUE_MUST_BE_STRING); return table.locate(name, value, o); } static void _locate(Request& r, MethodParams& params) { @@ -947,7 +1028,7 @@ static void join_nameless_row(Table& src static void _join(Request& r, MethodParams& params) { Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "source is not a table"); Table& src=*maybe_src; @@ -958,7 +1039,7 @@ static void _join(Request& r, MethodPara Table& dest=GET_SELF(r, VTable).table(); if(&src == &dest) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "source and destination are same table"); @@ -1087,11 +1168,11 @@ static void _sql(Request& r, MethodParam offset=(ulong)r.process_to_value(*voffset).as_double(); } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } @@ -1140,10 +1221,15 @@ static void _sql(Request& r, MethodParam GET_SELF(r, VTable).set_table(result); } -static void _columns(Request& r, MethodParams&) { +static void _columns(Request& r, MethodParams& params) { + const String* column_column_name; + if(params.count()>0) + column_column_name=¶ms.as_string(0, COLUMN_NAME_MUST_BE_STRING); + else + column_column_name=new String("column"); Table::columns_type result_columns(new ArrayString); - *result_columns+=new String("column"); + *result_columns+=column_column_name; Table& result_table=*new Table(result_columns); Table& source_table=GET_SELF(r, VTable).table(); @@ -1159,7 +1245,7 @@ static void _columns(Request& r, MethodP } static void _select(Request& r, MethodParams& params) { - Value& vcondition=params.as_junction(0, "condition must be expression"); + Value& vcondition=params.as_expression(0, "condition must be number, bool or expression"); Table& source_table=GET_SELF(r, VTable).table(); Table& result_table=*new Table(source_table.columns()); @@ -1186,9 +1272,9 @@ MTable::MTable(): Methoded("table") { // ^table::create{data} // ^table::create[nameless]{data} // ^table::create[table] - add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2); + add_native_method("create", Method::CT_DYNAMIC, _create, 1, 3); // old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf - add_native_method("set", Method::CT_DYNAMIC, _create, 1, 2); + add_native_method("set", Method::CT_DYNAMIC, _create, 1, 3); // ^table::load[file] // ^table::load[nameless;file] @@ -1215,8 +1301,8 @@ MTable::MTable(): Methoded("table") { // ^table.menu{code}[delim] add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2); - // ^table:hash[key field name] - // ^table:hash[key field name][value field name(s) string/table] + // ^table.hash[key field name] + // ^table.hash[key field name][value field name(s) string/table] add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3); // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc] @@ -1236,12 +1322,12 @@ MTable::MTable(): Methoded("table") { add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2); - // ^table:sql[query] - // ^table:sql[query][$.limit(1) $.offset(2)] + // ^table::sql[query] + // ^table::sql[query][$.limit(1) $.offset(2)] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); - // ^table:columns[] - add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0); + // ^table.columns[[column name]] + add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1); // ^table.select(expression) = table add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);