### Eclipse Workspace Patch 1.0 #P cck_address Index: cck_address.install =================================================================== RCS file: /cvs/drupal/contributions/modules/cck_address/cck_address.install,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 cck_address.install --- cck_address.install 15 May 2007 18:04:30 -0000 1.1.2.3 +++ cck_address.install 6 Jun 2007 22:15:04 -0000 @@ -36,20 +36,20 @@ //I don't really know what I'm doing here, so if I screwed up the pgsql, let me know how to fix it. if (!db_table_exists('cck_address_states')) { $query1 = db_query("CREATE TABLE {cck_address_states} ( - state_id serial CHECK (rid >= 0), + state_id serial, state_name varchar(64) NOT NULL default '', - state_abbrv varchar(5) NOT NULL default '', - country_code varchar(2) NOT NULL default '', - PRIMARY KEY (state_id) - UNIQUE (state_name) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); + state_abbrv varchar(5) NOT NULL default '', + country_code varchar(2) NOT NULL default '', + PRIMARY KEY (state_id), + UNIQUE (state_name) + )"); } if (!db_table_exists('cck_address_countries')) { $query3 = db_query("CREATE TABLE {cck_address_countries} ( country_code varchar(2) NOT NULL default '', country_name varchar(64) NOT NULL default '', - PRIMARY KEY name_code (country_name, country_code) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); + PRIMARY KEY (country_name, country_code) + )"); } break; } @@ -120,8 +120,8 @@ $ret[] = $query3 = update_sql("CREATE TABLE {cck_address_countries} ( country_code varchar(2) NOT NULL default '', country_name varchar(64) NOT NULL default '', - PRIMARY KEY name_code (country_name, country_code) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); + PRIMARY KEY (country_name, country_code) + )"); } break; }