--- parser3/src/classes/table.C 2017/01/13 13:50:28 1.341 +++ parser3/src/classes/table.C 2020/12/17 19:51:21 1.355 @@ -1,10 +1,18 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ +#include "pa_config_includes.h" + +#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4) && !defined(PA_DEBUG_DISABLE_GC)) +#include +#include "../lib/gc/include/gc_allocator.h" +#define USE_STRINGSTREAM +#endif + #include "classes.h" #include "pa_vmethod_frame.h" @@ -17,12 +25,7 @@ #include "pa_vbool.h" #include "pa_array.h" -#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) -#include -#define USE_STRINGSTREAM -#endif - -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.341 2017/01/13 13:50:28 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.355 2020/12/17 19:51:21 moko Exp $"; // class @@ -37,16 +40,9 @@ public: DECLARE_CLASS_VAR(table, new MTable); -#define TABLE_REVERSE_NAME "reverse" - // globals -String sql_bind_name(SQL_BIND_NAME); -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); +#define TABLE_REVERSE_NAME "reverse" String table_reverse_name(TABLE_REVERSE_NAME); // methods @@ -413,15 +409,11 @@ static void _load(Request& r, MethodPara HashStringValue *options=0; TableControlChars control_chars; - if(options_param_index, gc_allocator > pa_stringstream; typedef std::basic_string, gc_allocator > pa_string; @@ -644,7 +635,7 @@ static void _save(Request& r, MethodPara --param_index; const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE); - String file_spec=r.absolute(file_name); + String file_spec=r.full_disk_path(file_name); if(do_append && file_exist(file_spec)) output_column_names=false; @@ -1016,7 +1007,7 @@ static void _hash(Request& r, MethodPara } #ifndef DOXYGEN -struct Table_seq_item { +struct Table_seq_item : public PA_Allocated { ArrayString* row; union { const char *c_str; @@ -1048,7 +1039,7 @@ static void _sort(Request& r, MethodPara Table& old_table=GET_SELF(r, VTable).table(); Table& new_table=*new Table(old_table.columns()); - Table_seq_item* seq=new(PointerFreeGC) Table_seq_item[old_table.count()]; + Table_seq_item* seq=new Table_seq_item[old_table.count()]; int i; // calculate key values @@ -1268,18 +1259,18 @@ static void join_nameless_row(Table& src *dest+=src[src.current()]; } static void _join(Request& r, MethodParams& params) { - Table& src=*params.as_table(0, "source"); + if(Table* src=params.as_table(0, "source")){ + Table::Action_options o=get_action_options(r, params, 1, *src); - Table::Action_options o=get_action_options(r, params, 1, src); - - Table& dest=GET_SELF(r, VTable).table(); - if(&src == &dest) - throw Exception(PARSER_RUNTIME, 0, "source and destination are same table"); - - 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); + Table& dest=GET_SELF(r, VTable).table(); + if(src == &dest) + throw Exception(PARSER_RUNTIME, 0, "source and destination are same table"); + + 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); + } } #ifndef DOXYGEN @@ -1299,17 +1290,21 @@ public: columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */); return false; } catch(...) { - error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); + error=SQL_Error("exception occurred in Table_sql_event_handlers::add_column"); return true; } } - bool before_rows(SQL_Error& error) { + bool before_rows(SQL_Error& error) { + if(table) { + error=SQL_Error("result must contain exactly one table"); + return true; + } try { table=new Table(&columns); columns_count=columns.count(); return false; } catch(...) { - error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); + error=SQL_Error("exception occurred in Table_sql_event_handlers::before_rows"); return true; } } @@ -1318,7 +1313,7 @@ public: *table+=row=new ArrayString(columns_count); return false; } catch(...) { - error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); + error=SQL_Error("exception occurred in Table_sql_event_handlers::add_row"); return true; } } @@ -1327,18 +1322,14 @@ public: *row+=str?new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):&String::Empty; return false; } catch(...) { - error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); + error=SQL_Error("exception occurred in Table_sql_event_handlers::add_row_cell"); return true; } } }; #endif -static void marshal_bind( - HashStringValue::key_type aname, - HashStringValue::value_type avalue, - SQL_Driver::Placeholder** pptr) -{ +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().untaint_cstr(String::L_AS_IS); @@ -1351,7 +1342,7 @@ static void marshal_bind( // not static, used elsewhere int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) { int hash_count=hash.count(); - placeholders=new SQL_Driver::Placeholder[hash_count]; + placeholders=new(PointerGC) SQL_Driver::Placeholder[hash_count]; SQL_Driver::Placeholder* ptr=placeholders; hash.for_each(marshal_bind, &ptr); return hash_count;