--- parser3/src/classes/table.C 2003/11/20 16:34:23 1.192 +++ parser3/src/classes/table.C 2005/08/26 11:12:45 1.211 @@ -1,11 +1,11 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2003/11/20 16:34:23 $"; +static const char * const IDENT_TABLE_C="$Date: 2005/08/26 11:12:45 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -21,7 +21,7 @@ static const char * const IDENT_TABLE_C= class MTable: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VTable(); } + Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); } public: MTable(); @@ -36,6 +36,7 @@ DECLARE_CLASS_VAR(table, new MTable, 0); // defines for globals +#define SQL_BIND_NAME "bind" #define SQL_LIMIT_NAME "limit" #define SQL_OFFSET_NAME "offset" #define SQL_DEFAULT_NAME "default" @@ -44,6 +45,7 @@ DECLARE_CLASS_VAR(table, new MTable, 0); // globals +String sql_bind_name(SQL_BIND_NAME); String sql_limit_name(SQL_LIMIT_NAME); String sql_offset_name(SQL_OFFSET_NAME); String sql_default_name(SQL_DEFAULT_NAME); @@ -178,34 +180,6 @@ static void _create(Request& r, MethodPa GET_SELF(r, VTable).set_table(table); } -static char* remove_encloser(char* cstr, char encloser) { - if(cstr[0]!=encloser) - return cstr; - - size_t length=strlen(cstr); - if(length<2 || cstr[length-1]!=encloser) - return cstr; - - // 'string' - - cstr[length-1]=0; - cstr++; - - // double-encloser stands for encloser - char *read; - char *write; - write=read=cstr; - while(char c=*read++) { - if(c==encloser && *read==encloser) - read++; - - *write++=c; - } - *write=0; // terminate - - return cstr; -} - struct lsplit_result { char* piece; char delim; @@ -249,7 +223,7 @@ static lsplit_result lsplit(char** strin char *write; write=read=string; char c; - while(c=*read++) { + while((c=*read++)) { if(c==encloser) { char n=*read; if(n==encloser) // double-encloser stands for encloser @@ -279,7 +253,8 @@ static void skip_empty_and_comment_lines while( char c=*data ) { if( c== '\n' || c == '#' ) { /*nowhere=*/getrow(&data); // remove empty&comment lines - *data_ref=data; + if(!(*data_ref=data)) + break; continue; } break; @@ -288,23 +263,22 @@ static void skip_empty_and_comment_lines } struct TableSeparators { - char column; - char encloser; - const String* sencloser; - - TableSeparators() { - column='\t'; - encloser=0; - } + char column; const String* scolumn; + char encloser; const String* sencloser; + + TableSeparators(): + column('\t'), scolumn(new String("\t", false)), + encloser(0), sencloser(0) + {} void load( HashStringValue& options ) { if(Value* vseparator=options.get(COLUMN_SEPARATOR_NAME)) { options.remove(COLUMN_SEPARATOR_NAME); - const String& sseparator=vseparator->as_string(); - if(sseparator.length()!=1) + scolumn=&vseparator->as_string(); + if(scolumn->length()!=1) throw Exception("parser.runtime", - &sseparator, + scolumn, "separator must be one character long"); - column=sseparator.first_char(); + column=scolumn->first_char(); } if(Value* vencloser=options.get(COLUMN_ENCLOSER_NAME)) { options.remove(COLUMN_ENCLOSER_NAME); @@ -363,7 +337,7 @@ static void _load(Request& r, MethodPara Table::element_type row(new ArrayString); skip_empty_and_comment_lines(&data); while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) { - if(!sr.delim && !row->count()) // append last empty column [if without \n] + if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n] break; *row+=new String(sr.piece, 0, true); if(sr.delim=='\n') { @@ -396,7 +370,7 @@ static void maybe_enclose( String& to, c to<<*sencloser; } else - to.append(from, String::L_TABLE); + to< i(*table.columns()); i.has_next(); ) { maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser ); if(i.has_next()) - sdata.append_know_length("\t", 1, String::L_CLEAN); + sdata<<*separators.scolumn; } } else { // nameless table [we were asked to output column names] if(int lsize=table.count()?table[0]->count():0) @@ -452,7 +426,7 @@ static void _save(Request& r, MethodPara char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER]; sdata.append_know_length(cindex_tab, snprintf(cindex_tab, MAX_NUMBER, - column c(*i.next()); c.has_next(); ) { maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser ); if(c.has_next()) - sdata.append_know_length("\t", 1, String::L_CLEAN); + sdata<<*separators.scolumn; } sdata.append_know_length("\n", 1, String::L_CLEAN); } @@ -503,8 +477,8 @@ static void _offset(Request& r, MethodPa "is invalid whence, valid are 'cur' or 'set'"); } - Value& offset_expr=params.as_junction(params.count()-1, "offset must be expression"); - table.offset(absolute, r.process_to_value(offset_expr).as_int()); + int offset=params.as_int(params.count()-1, "offset must be expression", r); + table.offset(absolute, offset); } else r.write_no_lang(*new VInt(table.current())); } @@ -657,7 +631,7 @@ static void _hash(Request& r, MethodPara } else throw Exception("parser.runtime", 0, - "value field(s) must be string or self_table" + "value field(s) must be string or table" ); } else { // by all columns, including key if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST)) @@ -667,21 +641,25 @@ static void _hash(Request& r, MethodPara { - Row_info info={0}; - info.r=&r; - info.table=&self_table; Value* key_param=¶ms[0]; - info.key_code=key_param->get_junction()?key_param:0; - info.key_field=info.key_code?-1 - :self_table.column_name2index(key_param->as_string(), true); - info.value_fields=&value_fields; - info.hash=&result.hash(); - info.distinct=distinct; - info.row=0; + Row_info info={ + &r, + &self_table, + /*key_code=*/key_param->get_junction()?key_param:0, + /*key_field=*/0/*filled below*/, + &value_fields, + &result.hash(), + distinct, + /*row=*/0 + }; + 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(); } } r.write_no_lang(result); @@ -854,7 +832,7 @@ static void _join(Request& r, MethodPara 0, "source and destination are same table"); - if(Table::columns_type dest_columns=dest.columns()) // dest is named + if(dest.columns()) // dest is named src.table_for_each(join_named_row, &dest, o); else // dest is nameless src.table_for_each(join_nameless_row, &dest, o); @@ -912,9 +890,51 @@ public: } }; #endif + +static void marshal_bind( + HashStringValue::key_type aname, + HashStringValue::value_type avalue, + SQL_Driver::Placeholder** pptr) +{ + SQL_Driver::Placeholder& ph=**pptr; + ph.name=aname.cstr(); + ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED); + ph.is_null=avalue->get_class()==void_class; + ph.were_updated=false; + + (*pptr)++; +} + +// not static, used elsewhere +int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) { + int hash_count=hash.count(); + placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count]; + SQL_Driver::Placeholder* ptr=placeholders; + hash.for_each(marshal_bind, &ptr); + return hash_count; +} + +// not static, used elsewhere +void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders) { + SQL_Driver::Placeholder* ph=placeholders; + for(int i=0; iwere_updated) { + Value* value; + if(ph->is_null) + value=new VVoid(); + else + if(ph->value) + value=new VString(*new String(ph->value, 0, true/*tainted*/)); + else + value=new VString(*new String()); + hash.put(ph->name, value); + } +} + static void _sql(Request& r, MethodParams& params) { Value& statement=params.as_junction(0, "statement must be code"); + HashStringValue* bind=0; ulong limit=0; ulong offset=0; if(params.count()>1) { @@ -922,6 +942,10 @@ static void _sql(Request& r, MethodParam if(!voptions.is_string()) if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; + if(Value* vbind=options->get(sql_bind_name)) { + valid_options++; + bind=vbind->get_hash(); + } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); @@ -940,6 +964,11 @@ static void _sql(Request& r, MethodParam "options must be hash"); } + SQL_Driver::Placeholder* placeholders=0; + uint placeholders_count=0; + if(bind) + placeholders_count=marshal_binds(*bind, placeholders); + Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); const char* statement_cstr= @@ -951,7 +980,9 @@ static void _sql(Request& r, MethodParam gettimeofday(&mt[0],NULL); #endif r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + placeholders_count, placeholders, + offset, limit, handlers, statement_string); @@ -966,6 +997,9 @@ static void _sql(Request& r, MethodParam r.sql_request_time+=t[1]-t[0]; #endif + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); + Table& result= handlers.table?*handlers.table: // query resulted in table? return it *new Table(Table::columns_type(0)); // query returned no table, fake it @@ -1004,7 +1038,6 @@ static void _select(Request& r, MethodPa source_table.set_current(row); bool condition=r.process_to_value(vcondition, - /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(condition) // ...condition is true=