--- copyright.install.orig  2008-07-13 12:06:58.000000000 +0100
+++ copyright.install   2008-07-13 12:13:24.000000000 +0100
@@ -50,27 +50,31 @@
       break;
 
     case 'pgsql':
-      $ret = db_query("CREATE TABLE {copyrights} (".
-                      "cpyid int not null primary key default
                       nextval('{copyrights}_cpyid_seq'), ".
-                      "name varchar(60) NOT NULL, ".
-                      "description varchar(255) NULL DEFAULT NULL, ".
-                      "site_notice text NOT NULL, ".
-                      "node_notice text NOT NULL, ".
-                      "image_url varchar(255) NULL DEFAULT NULL, ".
-                      "source_url varchar(255) NULL DEFAULT NULL, ".
-                      "license text NULL)");
+      $ret = db_query("CREATE TABLE {copyrights} (
+                       cpyid serial NOT NULL,
+                       name character varying(60) NOT NULL,
+                       description character varying(255),
+                       site_notice text NOT NULL,
+                       node_notice text NOT NULL,
+                       image_url character varying(255),
+                       source_url character varying(255),
+                       license text
+                       );");
 
       $ret = $ret &&
-             db_query("CREATE SEQUENCE {copyrights}_cpyid_seq START 0");
+             db_query("ALTER TABLE ONLY {copyrights} ADD CONSTRAINT {copyrights}_pkey PRIMARY KEY (cpyid);");
 
       $ret = $ret &&
-             db_query("CREATE TABLE {copyright_node} (".
-                      "nid integer NOT NULL, ".
-                      "cpyid integer NOT NULL, ".
-                      "children_show_notice bool NOT NULL DEFAULT TRUE, ".
-                      "original_author varchar(255) NULL DEFAULT NULL, ".
-                      "children_allow_set bool NOT NULL DEFAULT TRUE, ".
-                      "PRIMARY KEY (nid))");
+             db_query("CREATE TABLE {copyright_node} (
+                       nid serial NOT NULL,
+                       cpyid integer NOT NULL,
+                       children_show_notice smallint NOT NULL,
+                       original_author character varying(255),
+                       children_allow_set smallint NOT NULL
+                       );");
+             
+      $ret = $ret && 
+             db_query("ALTER TABLE ONLY {copyright_node} ADD CONSTRAINT {copyright_node}_pkey PRIMARY KEY (nid);");
 
       $ret = $ret &&
              db_query("CREATE TABLE {copyright_user} (".