--- parser3/src/classes/table.C 2004/05/26 08:21:56 1.202 +++ parser3/src/classes/table.C 2004/12/23 14:51:31 1.207 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2004/05/26 08:21:56 $"; +static const char * const IDENT_TABLE_C="$Date: 2004/12/23 14:51:31 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -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); @@ -261,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); @@ -417,7 +418,7 @@ static void _save(Request& r, MethodPara for(Array_iterator 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) @@ -425,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); } @@ -657,6 +658,8 @@ static void _hash(Request& r, MethodPara 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); @@ -887,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) { @@ -897,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(); @@ -915,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= @@ -926,7 +980,9 @@ static void _sql(Request& r, MethodParam gettimeofday(&mt[0],NULL); #endif r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + 0, 0, + offset, limit, handlers, statement_string); @@ -941,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