Update of /cvsroot/monetdb/sql/src/storage/bat
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21491/bat
Modified Files:
bat_connections.mx
Log Message:
Changes to use a different default dbalias.
Index: bat_connections.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/bat/bat_connections.mx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bat_connections.mx 24 Jan 2007 16:34:22 -0000 1.2
+++ bat_connections.mx 22 Mar 2007 13:07:12 -0000 1.3
@@ -44,10 +44,10 @@
create_column(tr, t, "server", "char",1024);
create_column(tr, t, "port", "int",32);
create_column(tr, t, "db", "char",64);
- create_column(tr, t, "db_alias", "char",64);
- create_column(tr, t, "user", "char",64);
- create_column(tr, t, "password", "char",64);
- create_column(tr, t, "language", "char",64);
+ create_column(tr, t, "db_alias", "char",1024);
+ create_column(tr, t, "user", "char",1024);
+ create_column(tr, t, "password", "char",1024);
+ create_column(tr, t, "language", "char",1024);
return 0;
}
@@ -87,6 +87,8 @@
id = *(int *) column_find_value(tr, col_id, rid);
table_delete(tr, t, rid);
}
+ else
+ id = 0;
return id;
}
@@ -103,7 +105,7 @@
}
list*
-sql_trans_get_connection(sql_trans* tr, int id, char *server, char *db, char
*db_alias)
+sql_trans_get_connection(sql_trans* tr, int id, char *server, char *db, char
*db_alias, char *user)
{
ssize_t rid = -1;
sql_schema *s = find_sql_schema(tr, "sys");
@@ -122,7 +124,7 @@
col_lang = find_sql_column(con, "language");
if (db_alias == NULL){
- snprintf(dbalias, BUFSIZ, "%s_%s", server, db);
+ snprintf(dbalias, BUFSIZ, "%s_%s_%s", server, db, user);
db_alias = dbalias;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
