diff --git a/lib/modules/Sql.pmod/msql.pike b/lib/modules/Sql.pmod/msql.pike index 0d9a69e2ff917b11b40b3e692a525d7efc912d08..8abf914592ce015fd83e2ddb5944c9cb52a930e0 100644 --- a/lib/modules/Sql.pmod/msql.pike +++ b/lib/modules/Sql.pmod/msql.pike @@ -11,7 +11,7 @@ array(mapping(string:mixed)) query(string q, mapping(string|int:mixed)|void bindings) { if (!bindings) return ::query(q); - return ::query(.sql_util.emulate_bindings(q,bindings),this_object()); + return ::query(.sql_util.emulate_bindings(q,bindings),this); } #endif /* constant(Msql.msql) */ diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike index 17df1f6b5180a16b9b2ef2f468246aa36081b56d..a289d08bb30d8bd0938229423ffeb455329d944c 100644 --- a/lib/modules/Sql.pmod/mysql.pike +++ b/lib/modules/Sql.pmod/mysql.pike @@ -1,5 +1,5 @@ /* - * $Id: mysql.pike,v 1.18 2003/08/22 14:24:06 nilsson Exp $ + * $Id: mysql.pike,v 1.19 2003/12/31 00:10:26 nilsson Exp $ * * Glue for the Mysql-module */ @@ -149,9 +149,10 @@ int|object big_query(string q, mapping(string|int:mixed)|void bindings) { if (!bindings) return ::big_query(q); - return ::big_query(.sql_util.emulate_bindings(q,bindings,this_object())); + return ::big_query(.sql_util.emulate_bindings(q,bindings,this)); } + int(0..1) is_keyword( string name ) //! Return 1 if the argument @[name] is a mysql keyword. { diff --git a/lib/modules/Sql.pmod/odbc.pike b/lib/modules/Sql.pmod/odbc.pike index a14c6bdc2da12264a64034dc5132cc045c43f947..da4a886674515d4ce2f88cae0eb6967aebca5fe1 100644 --- a/lib/modules/Sql.pmod/odbc.pike +++ b/lib/modules/Sql.pmod/odbc.pike @@ -1,5 +1,5 @@ /* - * $Id: odbc.pike,v 1.11 2002/11/27 15:40:34 mast Exp $ + * $Id: odbc.pike,v 1.12 2003/12/31 00:10:26 nilsson Exp $ * * Glue for the ODBC-module */ @@ -13,7 +13,7 @@ int|object big_query(object|string q, mapping(string|int:mixed)|void bindings) { if (!bindings) return ::big_query(q); - return ::big_query(.sql_util.emulate_bindings(q, bindings, this_object())); + return ::big_query(.sql_util.emulate_bindings(q, bindings, this)); } constant list_dbs = Odbc.list_dbs; diff --git a/lib/modules/Sql.pmod/postgres.pike b/lib/modules/Sql.pmod/postgres.pike index fe1fa4463df3fae1cc316e3273826406ee769cd9..904477e4ab5f479499cb80b4e87c1306c76eea8a 100644 --- a/lib/modules/Sql.pmod/postgres.pike +++ b/lib/modules/Sql.pmod/postgres.pike @@ -1,7 +1,7 @@ /* * This is part of the Postgres module for Pike. * - * $Id: postgres.pike,v 1.21 2003/12/01 17:09:17 nilsson Exp $ + * $Id: postgres.pike,v 1.22 2003/12/31 00:10:26 nilsson Exp $ * */ @@ -376,7 +376,7 @@ int|object big_query(object|string q, mapping(string|int:mixed)|void bindings) { if (!bindings) return ::big_query(q); - return ::big_query(.sql_util.emulate_bindings(q, bindings, this_object())); + return ::big_query(.sql_util.emulate_bindings(q, bindings, this)); } #endif /* constant(Postgres.postgres) */ diff --git a/lib/modules/Sql.pmod/rsql.pike b/lib/modules/Sql.pmod/rsql.pike index b4cbbb0772ed68a4146fdd10662fcc9ce5776b12..935a611f036cda172a2b3f843c2d879a6d160321 100644 --- a/lib/modules/Sql.pmod/rsql.pike +++ b/lib/modules/Sql.pmod/rsql.pike @@ -157,7 +157,7 @@ string quote(string s) int|object big_query(object|string q, mapping(string|int:mixed)|void bindings) { if(bindings) - q=.sql_util.emulate_bindings(q,bindings,this_object()); + q=.sql_util.emulate_bindings(q,bindings,this); mixed qid = do_request('Q', q); return qid && class { @@ -219,7 +219,7 @@ void create(string|void host, string|void db, string|void user, string|void pw) // Reconstruct the original URL (minus rsql://) if(!host) { - destruct(this_object()); + destruct(this); return; } if(db) @@ -231,7 +231,7 @@ void create(string|void host, string|void db, string|void user, string|void pw) array(string) arr = host/"/"; if(sizeof(arr)<2) { - destruct(this_object()); + destruct(this); return; } diff --git a/lib/modules/Sql.pmod/sybase.pike b/lib/modules/Sql.pmod/sybase.pike index 68a92a7d31cc5f7563232afa637aeeedeb21d4da..79c7d6c737098f2cda26d573a3c567cc5185a703 100644 --- a/lib/modules/Sql.pmod/sybase.pike +++ b/lib/modules/Sql.pmod/sybase.pike @@ -2,7 +2,7 @@ * Sybase driver for the Pike programming language. * By Francesco Chemolli <kinkie@roxen.com> 10/12/1999 * - * $Id: sybase.pike,v 1.7 2002/11/27 15:40:34 mast Exp $ + * $Id: sybase.pike,v 1.8 2003/12/31 00:10:26 nilsson Exp $ * */ @@ -101,7 +101,7 @@ void create(void|string host, void|string db, void|string user, int|object big_query(string q, mapping(string|int:mixed)|void bindings) { if (!bindings) return ::big_query(q); - return ::big_query(.sql_util.emulate_bindings(q,bindings,this_object())); + return ::big_query(.sql_util.emulate_bindings(q,bindings,this)); } #endif