Index: admin/inc/class.soapplications.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/admin/inc/class.soapplications.inc.php,v retrieving revision 1.4 diff -u -r1.4 class.soapplications.inc.php --- admin/inc/class.soapplications.inc.php 6 Jan 2002 05:01:29 -0000 1.4 +++ admin/inc/class.soapplications.inc.php 20 Feb 2002 20:57:51 -0000 @@ -67,7 +67,9 @@ . $app_id . ",'" . addslashes($data['n_app_name']) . "','" . addslashes($data['n_app_title']) . "','" . $data['n_app_status'] . "','" . $data['app_order'] . "')"; + $this->db->auto_insert_on("phpgw_applications"); $this->db->query($sql,__LINE__,__FILE__); + $this->db->auto_insert_off("phpgw_applications"); return True; } Index: mediadb/setup/default_records.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/mediadb/setup/default_records.inc.php,v retrieving revision 1.1 diff -u -r1.1 default_records.inc.php --- mediadb/setup/default_records.inc.php 17 Jun 2001 20:49:29 -0000 1.1 +++ mediadb/setup/default_records.inc.php 20 Feb 2002 20:57:51 -0000 @@ -10,39 +10,47 @@ \**************************************************************************/ /* $Id: default_records.inc.php,v 1.1 2001/06/17 20:49:29 milosch Exp $ */ - $oProc->query("INSERT INTO phpgw_mediadb_cat VALUES (1,'default',2, + $GLOBALS['phpgw_setup']->db->auto_insert_on("phpgw_mediadb_cat"); + $oProc->query("INSERT INTO phpgw_mediadb_cat (cat_id,cat_name,cat_enabled, + cat_fname,cat_fenabled,cat_fwidth,cat_fsort) VALUES (1,'default',2, 'media_data.data_title,media_artist.artist_name,media_format.format_desc,media_data.data_date,media.media_idate,media_genre.genre_desc,media_rating.rating_desc,media_data.data_score,media.media_owner,media_data.data_comments,imdb,edit,avail', '1,1,1,1,0,1,1,1,1,0,2,1,1', '20,15,10,5,10,10,5,5,10,16,4,4,1', '1,0,0,0,0,0,0,0,0,0,0,0,0')" ); - $oProc->query("INSERT INTO phpgw_mediadb_cat VALUES (2,'archives',1, + $oProc->query("INSERT INTO phpgw_mediadb_cat (cat_id,cat_name,cat_enabled, + cat_fname,cat_fenabled,cat_fwidth,cat_fsort) VALUES (2,'archives',1, 'title,admin,media,year,date,genre,rated,scoring,owner,comment,imdb,edit,avail', '1,1,1,0,1,0,0,0,1,1,2,1,1', '20,15,10,5,10,10,5,5,10,16,4,4,1', '1,0,0,0,0,0,0,0,0,0,0,0,0')" ); - $oProc->query("INSERT INTO phpgw_mediadb_cat VALUES (3,'books',1, + $oProc->query("INSERT INTO phpgw_mediadb_cat (cat_id,cat_name,cat_enabled, + cat_fname,cat_fenabled,cat_fwidth,cat_fsort) VALUES (3,'books',1, 'title,author,media,year,date,genre,rated,scoring,owner,comment,imdb,edit,avail', '1,1,1,1,0,1,1,1,1,0,2,1,1', '20,15,10,5,10,10,5,5,10,16,4,4,1', '1,0,0,0,0,0,0,0,0,0,0,0,0')" ); - $oProc->query("INSERT INTO phpgw_mediadb_cat VALUES (4,'games',1, + $oProc->query("INSERT INTO phpgw_mediadb_cat (cat_id,cat_name,cat_enabled, + cat_fname,cat_fenabled,cat_fwidth,cat_fsort) VALUES (4,'games',1, 'title,developer,media,year,date,genre,rated,scoring,owner,comment,imdb,edit,avail', '1,1,1,1,0,1,1,1,1,0,2,1,1', '20,15,10,5,10,10,5,5,10,16,4,4,1', '1,0,0,0,0,0,0,0,0,0,0,0,0')" ); - $oProc->query("INSERT INTO phpgw_mediadb_cat VALUES (5,'movies',1, + $oProc->query("INSERT INTO phpgw_mediadb_cat (cat_id,cat_name,cat_enabled, + cat_fname,cat_fenabled,cat_fwidth,cat_fsort) VALUES (5,'movies',1, 'title,actor,media,year,date,genre,rated,scoring,owner,comment,imdb,edit,avail', '1,1,1,1,0,1,1,1,1,0,1,1,1', '20,15,5,5,10,10,5,5,10,16,4,4,1', '1,0,0,0,0,0,0,0,0,0,0,0,0')" ); - $oProc->query("INSERT INTO phpgw_mediadb_cat VALUES (6,'music',1, + $oProc->query("INSERT INTO phpgw_mediadb_cat (cat_id,cat_name,cat_enabled, + cat_fname,cat_fenabled,cat_fwidth,cat_fsort) VALUES (6,'music',1, 'title,artist,media,year,date,genre,rated,scoring,owner,comment,imdb,edit,avail', '1,1,1,1,0,1,1,1,1,0,2,1,1', '20,15,10,5,10,10,5,5,10,16,4,4,1', '1,0,0,0,0,0,0,0,0,0,0,0,0')" ); + $GLOBALS['phpgw_setup']->db->auto_insert_off("phpgw_mediadb_cat"); Index: phpgwapi/inc/class.db_msql.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_msql.inc.php,v retrieving revision 1.5 diff -u -r1.5 class.db_msql.inc.php --- phpgwapi/inc/class.db_msql.inc.php 29 Sep 2001 00:33:05 -0000 1.5 +++ phpgwapi/inc/class.db_msql.inc.php 20 Feb 2002 20:57:51 -0000 @@ -159,6 +159,15 @@ print $this->Record[$Name]; } + // do nothing? + function auto_insert_on($table) + { + } + + function auto_insert_off($table) + { + } + function halt($msg) { printf("<b>Database error:</b> <br>\n", $msg); Index: phpgwapi/inc/class.db_mssql.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_mssql.inc.php,v retrieving revision 1.20.2.1 diff -u -r1.20.2.1 class.db_mssql.inc.php --- phpgwapi/inc/class.db_mssql.inc.php 15 Feb 2002 01:25:03 -0000 1.20.2.1 +++ phpgwapi/inc/class.db_mssql.inc.php 20 Feb 2002 20:57:51 -0000 @@ -321,6 +324,16 @@ function unlock() { return $this->transaction_commit(); + } + + function auto_insert_on($table) + { + $this->query("SET IDENTITY_INSERT $table ON"); + } + + function auto_insert_off($table) + { + $this->query("SET IDENTITY_INSERT $table OFF"); } /* private: error handling */ Index: phpgwapi/inc/class.db_mysql.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_mysql.inc.php,v retrieving revision 1.30 diff -u -r1.30 class.db_mysql.inc.php --- phpgwapi/inc/class.db_mysql.inc.php 28 Dec 2001 05:25:07 -0000 1.30 +++ phpgwapi/inc/class.db_mysql.inc.php 20 Feb 2002 20:57:51 -0000 @@ -537,6 +537,15 @@ return $res; } + // do nothing? + function auto_insert_on($table) + { + } + + function auto_insert_off($table) + { + } + /* private: error handling */ function halt($msg, $line = '', $file = '') { Index: phpgwapi/inc/class.db_odbc.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_odbc.inc.php,v retrieving revision 1.5 diff -u -r1.5 class.db_odbc.inc.php --- phpgwapi/inc/class.db_odbc.inc.php 29 Sep 2001 00:30:07 -0000 1.5 +++ phpgwapi/inc/class.db_odbc.inc.php 20 Feb 2002 20:57:51 -0000 @@ -202,6 +202,15 @@ print $this->f($Field_Name); } + // do nothing? + function auto_insert_on($table) + { + } + + function auto_insert_off($table) + { + } + function halt($msg) { printf("<b>Database error:</b> <br>\n", $msg); Index: phpgwapi/inc/class.db_oracle.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_oracle.inc.php,v retrieving revision 1.6 diff -u -r1.6 class.db_oracle.inc.php --- phpgwapi/inc/class.db_oracle.inc.php 28 Sep 2001 21:27:40 -0000 1.6 +++ phpgwapi/inc/class.db_oracle.inc.php 20 Feb 2002 20:57:51 -0000 @@ -506,6 +506,15 @@ $this->Query_ID=0; } + // do nothing? + function auto_insert_on($table) + { + } + + function auto_insert_off($table) + { + } + /* private: error handling */ function halt($msg) { Index: phpgwapi/inc/class.db_pgsql.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_pgsql.inc.php,v retrieving revision 1.30 diff -u -r1.30 class.db_pgsql.inc.php --- phpgwapi/inc/class.db_pgsql.inc.php 28 Dec 2001 06:02:30 -0000 1.30 +++ phpgwapi/inc/class.db_pgsql.inc.php 20 Feb 2002 20:57:51 -0000 @@ -477,6 +477,15 @@ print $this->Record[$Name]; } + // do nothing? + function auto_insert_on($table) + { + } + + function auto_insert_off($table) + { + } + function halt($msg, $line = '', $file = '') { if ($this->Halt_On_Error == 'no') Index: phpgwapi/inc/class.db_sybase.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_sybase.inc.php,v retrieving revision 1.6 diff -u -r1.6 class.db_sybase.inc.php --- phpgwapi/inc/class.db_sybase.inc.php 29 Sep 2001 00:25:58 -0000 1.6 +++ phpgwapi/inc/class.db_sybase.inc.php 20 Feb 2002 20:57:51 -0000 @@ -157,6 +157,16 @@ print $this->Record[$Name]; } + function auto_insert_on($table) + { + $this->query("SET IDENTITY_INSERT $table ON"); + } + + function auto_insert_off($table) + { + $this->query("SET IDENTITY_INSERT $table OFF"); + } + function halt($msg) { printf("<b>Database error:</b> <br>\n", $msg); Index: setup/inc/class.setup.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/setup/inc/class.setup.inc.php,v retrieving revision 1.19.2.2 diff -u -r1.19.2.2 class.setup.inc.php --- setup/inc/class.setup.inc.php 30 Jan 2002 04:42:08 -0000 1.19.2.2 +++ setup/inc/class.setup.inc.php 20 Feb 2002 20:57:52 -0000 @@ -281,6 +281,7 @@ $app_id = rand(1,100000) . ','; $app_idstr = 'app_id,'; } + $this->db->auto_insert_on($appstbl); } $this->db->query("INSERT INTO $appstbl " . "($app_idstr app_name,app_title,app_enabled,app_order,app_tables,app_version) " @@ -293,6 +294,10 @@ . "'" . $tables . "'," . "'" . $setup_info[$appname]['version'] . "');" ); + if($use_appid) + { + $this->db->auto_insert_off($appstbl); + } $this->clear_session_cache(); } } Index: timetrack/admin1.php =================================================================== RCS file: /cvsroot/phpgroupware/timetrack/admin1.php,v retrieving revision 1.11 diff -u -r1.11 admin1.php --- timetrack/admin1.php 5 Jul 2001 19:35:54 -0000 1.11 +++ timetrack/admin1.php 20 Feb 2002 20:57:52 -0000 @@ -31,8 +31,10 @@ $phpgw->db->query("SELECT MAX(location_id) from phpgw_ttrack_locations"); $phpgw->db->next_record(); $next_id = $phpgw->db->f(0) + 1; + $this->db->auto_insert_on("phpgw_ttrack_locations"); $phpgw->db->query("insert into phpgw_ttrack_locations (location_id,location_name) " . "VALUES ($next_id,'$etext')"); + $this->db->auto_insert_off("phpgw_ttrack_locations"); $mode="edit"; $phpgw->db->query("select location_id from phpgw_ttrack_locations where location_name='$etext'"); $phpgw->db->next_record();