Index: acl.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/acl/acl.install,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 acl.install --- acl.install 21 Nov 2006 21:30:32 -0000 1.1.2.3 +++ acl.install 22 Aug 2007 01:32:07 -0000 @@ -36,7 +36,7 @@ name varchar(255), PRIMARY KEY (acl_id) );"); - db_query("CREATE SEQUENCE acl_id_seq;"); + db_query("CREATE SEQUENCE {acl}_acl_id_seq;"); db_query("CREATE TABLE {acl_user} ( acl_id integer NOT NULL DEFAULT 0, @@ -59,3 +59,22 @@ } drupal_set_message("acl database tables created."); } + +// fix our sequences entry to support database prefixes +function acl_update_1() { + $ret = array(); + switch ($GLOBALS['db_type']) { + case 'mysqli': + case 'mysql': + db_query('LOCK TABLES {sequences} WRITE'); + $ret[] = update_sql("UPDATE {sequences} SET name = '". db_prefix_tables('{acl}_acl_id') ."' WHERE name = 'acl_id'"); + db_query('UNLOCK TABLES'); + break; + case 'pgsql': + db_query('START TRANSACTION;'); + $ret[] = update_sql("CREATE SEQUENCE {acl}_acl_id_seq START ". db_next_id('acl_id')); + db_query('COMMIT;'); + break; + } + return $ret; +} Index: acl.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/acl/acl.module,v retrieving revision 1.1.2.11 diff -u -r1.1.2.11 acl.module --- acl.module 18 May 2007 13:23:49 -0000 1.1.2.11 +++ acl.module 22 Aug 2007 01:32:07 -0000 @@ -14,7 +14,7 @@ * Create a new ACL. */ function acl_create_new_acl($module, $name) { - $acl_id = db_next_id('acl_id'); + $acl_id = db_next_id('{acl}_acl_id'); db_query("INSERT INTO {acl} (acl_id, module, name) VALUES (%d, '%s', '%s')", $acl_id, $module, $name); return $acl_id; }