diff -urw textimage-5.x-1.2/textimage.install textimage/textimage.install --- textimage-5.x-1.2/textimage.install 2007-02-06 03:29:38.000000000 +0100 +++ textimage/textimage.install 2007-02-19 11:24:52.000000000 +0100 @@ -16,12 +16,12 @@ case 'pgsql': db_query('CREATE TABLE {textimage_preset} ( - pid INTEGER NOT NULL CHECK (presetid > 0), + pid INTEGER NOT NULL CHECK (pid > 0), name VARCHAR(255) NOT NULL DEFAULT \'\', - settings TEXT NOT NULL DEFAULT \'\' - PRIMARY KEY (presetid));' + settings TEXT NOT NULL DEFAULT \'\', + PRIMARY KEY (pid));' ); - db_query("CREATE SEQUENCE textimage_preset_presetid_seq INCREMENT 1 START 1;"); + db_query("CREATE SEQUENCE {textimage_preset_pid_seq} INCREMENT 1 START 1;"); break; } } @@ -34,6 +34,10 @@ if($path != FALSE) _textimage_recursive_delete($path); + if ($GLOBALS['db_type'] == 'pgsql') { + db_query('DROP SEQUENCE {textimage_preset_pid_seq};'); + } + variable_del('textimage_fonts_path'); variable_del('textimage_images_path'); variable_del('textimage_captcha_fonts_path'); @@ -67,12 +71,12 @@ case 'pgsql': $ret[] = update_sql('CREATE TABLE {textimage_preset} ( - pid INTEGER NOT NULL CHECK (presetid > 0), + pid INTEGER NOT NULL CHECK (pid > 0), name VARCHAR(255) NOT NULL DEFAULT \'\', - settings TEXT NOT NULL DEFAULT \'\' - PRIMARY KEY (presetid));' + settings TEXT NOT NULL DEFAULT \'\', + PRIMARY KEY (pid));' ); - $ret[] = update_sql("CREATE SEQUENCE textimage_preset_presetid_seq INCREMENT 1 START 1;"); + $ret[] = update_sql("CREATE SEQUENCE {textimage_preset_pid_seq} INCREMENT 1 START 1;"); break; }