--- parser3/src/classes/table.C	2001/04/05 11:36:51	1.52
+++ parser3/src/classes/table.C	2001/04/05 13:19:40	1.54
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.52 2001/04/05 11:36:51 paf Exp $
+	$Id: table.C,v 1.54 2001/04/05 13:19:40 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -188,6 +188,7 @@ static void _offset(Request& r, const St
 	}
 }
 
+/// @test $a.menu{ $a[123] }
 static void _menu(Request& r, const String& method_name, Array *params) {
 	Value& body_code=*static_cast<Value *>(params->get(0));
 	// forcing ^menu{this param type}
@@ -433,14 +434,14 @@ static void _sql(Request& r, const Strin
 
 	Value& statement=*static_cast<Value *>(params->get(0));
 	// forcing {this query param type}
-	r.fail_if_junction_(true, statement, method_name, "statement must not be junction");
+	r.fail_if_junction_(false, statement, method_name, "statement must be junction");
 
-	ulong count=0;
+	ulong limit=0;
 	if(params->size()>1) {
-		Value& count_code=*static_cast<Value *>(params->get(1));
-		// forcing (this count param type)
-		r.fail_if_junction_(false, count_code, method_name, "count must be expression");
-		count=(uint)r.process(count_code).as_double();
+		Value& limit_code=*static_cast<Value *>(params->get(1));
+		// forcing (this limit param type)
+		r.fail_if_junction_(false, limit_code, method_name, "limit must be expression");
+		limit=(uint)r.process(limit_code).as_double();
 	}
 
 	ulong offset=0;
@@ -451,14 +452,15 @@ static void _sql(Request& r, const Strin
 		offset=(ulong)r.process(offset_code).as_double();
 	}
 
-	const String& statement_string=statement.as_string();
-	const char *statement_cstr=statement_string.cstr(String::UL_SQL);
+	Temp_lang temp_lang(r, String::UL_SQL);
+	const String& statement_string=r.process(statement).as_string();
+	const char *statement_cstr=statement_string.cstr(String::UL_UNKNOWN, r.connection);
 	unsigned int sql_column_count; SQL_Driver::Cell *sql_columns;
 	unsigned long sql_row_count; SQL_Driver::Cell **sql_rows;
 	bool need_rethrow=false; Exception rethrow_me;
 	PTRY {
 		r.connection->query(
-			statement_cstr, 
+			statement_cstr, offset, limit,
 			&sql_column_count, &sql_columns,
 			&sql_row_count, &sql_rows);
 	}
@@ -468,7 +470,7 @@ static void _sql(Request& r, const Strin
 	PEND_CATCH
 	if(need_rethrow)
 		PTHROW(rethrow_me.type(), rethrow_me.code(),
-			&statement_string,
+			&statement_string, // setting more specific source [were url]
 			rethrow_me.comment());
 	
 	Array& table_columns=*new(pool) Array(pool);