--- parser3/src/classes/table.C	2007/05/23 08:30:35	1.228
+++ parser3/src/classes/table.C	2007/08/28 09:28:18	1.233
@@ -5,7 +5,10 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2007/05/23 08:30:35 $";
+static const char * const IDENT_TABLE_C="$Date: 2007/08/28 09:28:18 $";
+
+#include <sstream>
+using namespace std;
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -17,9 +20,6 @@ static const char * const IDENT_TABLE_C=
 #include "pa_sql_connection.h"
 #include "pa_vbool.h"
 
-#include <sstream>
-using namespace std;
-
 // class
 
 class MTable: public Methoded {
@@ -41,15 +41,8 @@ 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 SQL_VALUE_TYPE_NAME "type"
 #define TABLE_REVERSE_NAME "reverse"
 
-
 // globals
 
 String sql_bind_name(SQL_BIND_NAME);
@@ -303,7 +296,7 @@ struct TableSeparators {
 };
 
 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)
@@ -321,7 +314,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
 	);
@@ -421,7 +414,7 @@ static void _save_old(Request& r, Method
 	else
 		--param_index;
 
-	const String& file_name=params.as_string(param_index++, "file name must not be code");
+	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
@@ -506,7 +499,7 @@ static void _save(Request& r, MethodPara
 	else
 		--param_index;
 
-	const String& file_name=params.as_string(param_index++, "file name must not be code");
+	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
@@ -645,8 +638,6 @@ static void _menu(Request& r, MethodPara
 }
 
 #ifndef DOXYGEN
-enum Table2hash_distint { D_ILLEGAL, D_FIRST };
-enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE };
 struct Row_info {
 	Request *r;
 	Table *table;
@@ -720,6 +711,28 @@ static void table_row_to_hash(Table::ele
 			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,
+			"'type' must be hash");
+	}
+}
+
 static void _hash(Request& r, MethodParams& params) {
 	Table& self_table=GET_SELF(r, VTable).table();
 	VHash& result=*new VHash;
@@ -750,27 +763,13 @@ static void _hash(Request& r, MethodPara
 							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
 					}
 					if(Value* vvalue_type_code=options->get(sql_value_type_name)) {
-						if(value_type==C_TABLE){ // $.distinct[tables] was specified
+						if(value_type==C_TABLE){ // $.distinct[tables] was specified already
 							throw Exception(PARSER_RUNTIME,
 								0,
-								"you can't specify $.distinct[tables] and $.values[] together.");
+								"you can't specify $.distinct[tables] and $.type[] together.");
 						} else {
 							valid_options++;
-							Value& vvalue_type_value=r.process_to_value(*vvalue_type_code);
-							if(vvalue_type_value.is_string()) {
-								const String& svalue_type=*vvalue_type_value.get_string();
-								if(svalue_type == "table"){
-									value_type=C_TABLE;
-								} else if (svalue_type == "string") {
-									value_type=C_STRING;
-								} else if (svalue_type == "hash") {
-									value_type=C_HASH;
-								} else {
-									throw Exception(PARSER_RUNTIME,
-										&svalue_type,
-										"must be 'hash', 'table' or 'string'");
-								}
-							}
+							value_type=get_value_type(r.process_to_value(*vvalue_type_code));
 						}
 					} 
 
@@ -812,7 +811,7 @@ static void _hash(Request& r, MethodPara
 				if(value_type==C_STRING)
 					throw Exception(PARSER_RUNTIME,
 						0,
-						"with $.values[string] you must specify one value field(s)");
+						"with $.type[string] you must specify one value field(s)");
 				// if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
 					for(size_t i=0; i<columns->count(); i++)
 						value_fields+=i;
@@ -940,7 +939,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) {
@@ -1194,10 +1193,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=&params.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();
@@ -1213,7 +1217,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());
@@ -1294,8 +1298,8 @@ MTable::MTable(): Methoded("table") {
 	// ^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);