--- parser3/src/classes/table.C	2004/07/29 18:02:38	1.206
+++ parser3/src/classes/table.C	2005/08/26 12:01:38	1.212
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2004/07/29 18:02:38 $";
+static const char * const IDENT_TABLE_C="$Date: 2005/08/26 12:01:38 $";
 
 #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();
@@ -73,6 +73,7 @@ static Table::Action_options get_action_
 	]
 	but there is ^table.locate[name;value]
 
+	...if(voptions.is_defined() && !voptions.is_string()))
 	if(maybe_options.is_string()) { // allow empty options
 		result.defined=true;
 		return result;
@@ -477,8 +478,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()));
 }
@@ -658,6 +659,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);
@@ -937,7 +940,7 @@ static void _sql(Request& r, MethodParam
 	ulong offset=0;
 	if(params.count()>1) {
 		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(!voptions.is_string())
+		if(voptions.is_defined() && !voptions.is_string())
 			if(HashStringValue* options=voptions.get_hash()) {
 				int valid_options=0;
 				if(Value* vbind=options->get(sql_bind_name)) {
@@ -979,7 +982,7 @@ static void _sql(Request& r, MethodParam
 #endif	
 	r.connection()->query(
 		statement_cstr, 
-		0, 0,
+		placeholders_count, placeholders,
 		offset, limit, 
 		handlers,
 		statement_string);