--- parser3/src/classes/table.C	2020/12/17 19:51:21	1.355
+++ parser3/src/classes/table.C	2020/12/26 23:09:08	1.357
@@ -25,7 +25,7 @@
 #include "pa_vbool.h"
 #include "pa_array.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.357 2020/12/26 23:09:08 moko Exp $";
 
 // class
 
@@ -1501,6 +1501,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=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
+		name_to=&params.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; i<columns->count(); 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; i<columns->count(); 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") {
@@ -1584,4 +1620,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);
 }