Changeset 1075
- Timestamp:
- 10/27/07 18:38:38 (11 months ago)
- Files:
-
- branches/punbb-1.3-dev/extras/db_update.php (modified) (10 diffs)
- branches/punbb-1.3-dev/upload/install.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/punbb-1.3-dev/extras/db_update.php
r1072 r1075 339 339 case 'start': 340 340 // Add the extensions table if it doesn't already exist 341 if (!$db->table_exists($db _prefix.'extensions'))341 if (!$db->table_exists($db->prefix.'extensions')) 342 342 { 343 343 switch ($db_type) … … 345 345 case 'mysql': 346 346 case 'mysqli': 347 $sql = 'CREATE TABLE '.$db _prefix."extensions (347 $sql = 'CREATE TABLE '.$db->prefix."extensions ( 348 348 id VARCHAR(50) NOT NULL DEFAULT '', 349 349 title VARCHAR(255) NOT NULL DEFAULT '', … … 357 357 358 358 case 'pgsql': 359 $sql = 'CREATE TABLE '.$db _prefix."extensions (359 $sql = 'CREATE TABLE '.$db->prefix."extensions ( 360 360 id VARCHAR(50) NOT NULL DEFAULT '', 361 361 title VARCHAR(255) NOT NULL DEFAULT '', … … 369 369 370 370 case 'sqlite': 371 $sql = 'CREATE TABLE '.$db _prefix."extensions (371 $sql = 'CREATE TABLE '.$db->prefix."extensions ( 372 372 id VARCHAR(50) NOT NULL DEFAULT '', 373 373 title VARCHAR(255) NOT NULL DEFAULT '', … … 385 385 386 386 // Add the extension_hooks table if it doesn't already exist 387 if (!$db->table_exists($db _prefix.'extension_hooks'))387 if (!$db->table_exists($db->prefix.'extension_hooks')) 388 388 { 389 389 switch ($db_type) … … 391 391 case 'mysql': 392 392 case 'mysqli': 393 $sql = 'CREATE TABLE '.$db _prefix."extension_hooks (393 $sql = 'CREATE TABLE '.$db->prefix."extension_hooks ( 394 394 id VARCHAR(50) NOT NULL DEFAULT '', 395 395 extension_id VARCHAR(50) NOT NULL DEFAULT '', … … 401 401 402 402 case 'pgsql': 403 $sql = 'CREATE TABLE '.$db _prefix."extension_hooks (403 $sql = 'CREATE TABLE '.$db->prefix."extension_hooks ( 404 404 id VARCHAR(50) NOT NULL DEFAULT '', 405 405 extension_id VARCHAR(50) NOT NULL DEFAULT '', … … 411 411 412 412 case 'sqlite': 413 $sql = 'CREATE TABLE '.$db _prefix."extension_hooks (413 $sql = 'CREATE TABLE '.$db->prefix."extension_hooks ( 414 414 id VARCHAR(50) NOT NULL DEFAULT '', 415 415 extension_id VARCHAR(50) NOT NULL DEFAULT '', … … 523 523 524 524 // We need to add a unique index to avoid users having multiple rows in the online table 525 if ( ($db_type == 'mysql' || $db_type == 'mysqli') &&!$db->index_exists($db->prefix.'online', $db->prefix.'online_user_id_ident_idx'))525 if (!$db->index_exists($db->prefix.'online', $db->prefix.'online_user_id_ident_idx')) 526 526 { 527 527 $db->query('DELETE FROM '.$db->prefix.'online') or error(__FILE__, __LINE__); 528 $db->query('ALTER TABLE '.$db->prefix.'online ADD UNIQUE INDEX '.$db->prefix.'online_user_id_ident_idx (user_id, ident)') or error(__FILE__, __LINE__); 528 529 switch ($db_type) 530 { 531 case 'mysql': 532 case 'mysqli': 533 $db->query('ALTER TABLE '.$db->prefix.'online ADD UNIQUE INDEX '.$db->prefix.'online_user_id_ident_idx (user_id, ident)') or error(__FILE__, __LINE__); 534 break; 535 536 default: 537 $db->query('CREATE UNIQUE INDEX '.$db->prefix.'online_user_id_ident_idx ON '.$db->prefix.'online(user_id, ident)') or error(__FILE__, __LINE__); 538 break; 539 } 529 540 } 530 541 531 542 // Get rid of the old search tables for mysql/mysqli 532 if (($db_type == 'mysql' || $db_type == 'mysqli') && $db->table_exists($db _prefix.'search_cache') && $db->table_exists($db_prefix.'search_matches') && $db->table_exists($db_prefix.'search_words'))543 if (($db_type == 'mysql' || $db_type == 'mysqli') && $db->table_exists($db->prefix.'search_cache') && $db->table_exists($db->prefix.'search_matches') && $db->table_exists($db->prefix.'search_words')) 533 544 $db->query('DROP TABLE '.$db->prefix.'search_cache, '.$db->prefix.'search_matches, '.$db->prefix.'search_words') or error(__FILE__, __LINE__); 534 545 535 546 // Add fulltext indexes for mysql/mysqli 536 547 if (($db_type == 'mysql' || $db_type == 'mysqli') && !$db->index_exists($db->prefix.'posts', $db->prefix.'posts_message_idx')) 537 $db->query('ALTER TABLE '.$db _prefix.'posts ADD FULLTEXT '.$db_prefix.'posts_message_idx(message)') or error(__FILE__, __LINE__);548 $db->query('ALTER TABLE '.$db->prefix.'posts ADD FULLTEXT '.$db->prefix.'posts_message_idx(message)') or error(__FILE__, __LINE__); 538 549 if (($db_type == 'mysql' || $db_type == 'mysqli') && !$db->index_exists($db->prefix.'topics', $db->prefix.'topics_subject_idx')) 539 $db->query('ALTER TABLE '.$db _prefix.'topics ADD FULLTEXT '.$db_prefix.'topics_subject_idx(subject)') or error(__FILE__, __LINE__);550 $db->query('ALTER TABLE '.$db->prefix.'topics ADD FULLTEXT '.$db->prefix.'topics_subject_idx(subject)') or error(__FILE__, __LINE__); 540 551 541 552 // Add an index on last_post in the topics table … … 546 557 case 'mysql': 547 558 case 'mysqli': 548 $db->query('ALTER TABLE '.$db _prefix.'topics ADD INDEX '.$db_prefix.'topics_last_post_idx(last_post)') or error(__FILE__, __LINE__);559 $db->query('ALTER TABLE '.$db->prefix.'topics ADD INDEX '.$db->prefix.'topics_last_post_idx(last_post)') or error(__FILE__, __LINE__); 549 560 break; 550 561 551 562 default: 552 $db->query('CREATE INDEX '.$db _prefix.'topics_last_post_idx ON '.$db_prefix.'topics(last_post)') or error(__FILE__, __LINE__);563 $db->query('CREATE INDEX '.$db->prefix.'topics_last_post_idx ON '.$db->prefix.'topics(last_post)') or error(__FILE__, __LINE__); 553 564 break; 554 565 } branches/punbb-1.3-dev/upload/install.php
r1069 r1075 1339 1339 1340 1340 default: 1341 $queries[] = 'CREATE UNIQUE INDEX '.$db_prefix.'online_user_id_ident_idx ON '.$db_prefix.'online(user_id,ident)'; 1341 1342 $queries[] = 'CREATE INDEX '.$db_prefix.'online_user_id_idx ON '.$db_prefix.'online(user_id)'; 1342 1343 $queries[] = 'CREATE INDEX '.$db_prefix.'posts_topic_id_idx ON '.$db_prefix.'posts(topic_id)';
