--- parser3/src/main/pa_sql_driver_manager.C	2001/09/05 09:22:45	1.32
+++ parser3/src/main/pa_sql_driver_manager.C	2001/10/15 11:48:04	1.40
@@ -2,10 +2,10 @@
 	Parser: sql driver manager implementation.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_sql_driver_manager.C,v 1.40 2001/10/15 11:48:04 parser Exp $
 */
-static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.32 2001/09/05 09:22:45 parser Exp $"; 
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -14,12 +14,6 @@ static const char *RCSId="$Id: pa_sql_dr
 #include "pa_common.h"
 #include "pa_threads.h"
 
-#include "pa_sapi.h"
-
-// helper macros
-
-#define STRINGIZE(name) #name
-
 // globals
 
 SQL_Driver_manager *SQL_driver_manager;
@@ -41,6 +35,7 @@ public:
 	void *malloc(size_t size) { return Pooled::malloc(size); }
 	/// allocates some bytes clearing them with zeros
 	void *calloc(size_t size) { return Pooled::calloc(size); }
+
 	/// throw exception
 	void _throw(const char *comment) { 
 		THROW(0, 0, 
@@ -55,9 +50,10 @@ private:
 // SQL_Driver_manager
 
 /// @param request_url protocol://[driver-dependent]
-SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, 
+SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url,
+												   const String& request_origin,
 												   Table *protocol2driver_and_client) {
-	Pool& pool=request_url.pool(); // request pool											   
+	Pool& pool=request_origin.pool(); // request pool											   
 
 	// we have table for locating protocol's library
 	if(!protocol2driver_and_client)
@@ -79,8 +75,8 @@ SQL_Connection& SQL_Driver_manager::get_
 		int pos=request_url.pos("://", 3);
 		if(pos<0)
 			PTHROW(0, 0,
-				&request_url,
-				"no protocol specified"); // NOTE: not THROW, but PTHROW
+				request_url.size()?&request_url:&request_origin,
+				"connection string must start with protocol://"); // NOTE: not THROW, but PTHROW
 
 		// make global_url C-string on global pool
 		request_url_cstr=request_url.cstr(String::UL_AS_IS);
@@ -124,7 +120,7 @@ SQL_Connection& SQL_Driver_manager::get_
 					library,
 					"prepare to dynamic loading failed, %s", lt_dlerror());
 
-			const char *filename=library->cstr(String::UL_FILE_NAME);
+			const char *filename=library->cstr(String::UL_FILE_SPEC);
 			lt_dlhandle handle=lt_dlopen(filename);
 			if (!handle)
 				PTHROW(0, 0,
@@ -132,11 +128,11 @@ SQL_Connection& SQL_Driver_manager::get_
 					"can not open the module, %s", lt_dlerror());
 
 			SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, 
-				STRINGIZE(SQL_DRIVER_CREATE));
+				SQL_DRIVER_CREATE_NAME);
 			if(!create)
 				PTHROW(0, 0,
 					library,
-					"function '%s' was not found", STRINGIZE(SQL_DRIVER_CREATE));
+					"function '"SQL_DRIVER_CREATE_NAME"' was not found");
 
 			// create library-driver!
 			driver=(*create)();
@@ -153,7 +149,7 @@ SQL_Connection& SQL_Driver_manager::get_
 			bool specified_dlopen_file_spec=dlopen_file_spec && dlopen_file_spec->size();
 			const char *dlopen_file_spec_cstr=
 				specified_dlopen_file_spec?
-				dlopen_file_spec->cstr(String::UL_FILE_NAME):0;
+				dlopen_file_spec->cstr(String::UL_FILE_SPEC):0;
 			if(const char *error=driver->initialize(
 				dlopen_file_spec_cstr))
 				PTHROW(0, 0,