[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bricolage-commits
Subject:    [6066] s/NUMERIC/INTEGER|SMALLINT|BOOLEAN/g.
From:       theory () bricolage ! cc
Date:       2004-11-10 4:00:29
Message-ID: 20041110040029.25500.qmail () x1 ! develooper ! com
[Download RAW message or body]

Revision: 6066
Author:   theory
Date:     2004-11-08 19:32:57 -0800 (Mon, 08 Nov 2004)
ViewCVS:  http://viewsvn.bricolage.cc/?rev=6066&view=rev

Log Message:
-----------
s/NUMERIC/INTEGER|SMALLINT|BOOLEAN/g. With thanks to Neil Conway for the intitial patch.

Modified Files:
--------------
    bricolage/trunk/inst/upgrade/1.9.0/add_alpha_search_pref.pl
    bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm
    bricolage/trunk/lib/Bric/Biz/ATType.pm
    bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm
    bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm
    bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm
    bricolage/trunk/lib/Bric/Biz/AssetType.pm
    bricolage/trunk/lib/Bric/Biz/Category.pm
    bricolage/trunk/lib/Bric/Biz/Contact.pm
    bricolage/trunk/lib/Bric/Biz/Keyword.pm
    bricolage/trunk/lib/Bric/Biz/Org/Parts/Addr.pm
    bricolage/trunk/lib/Bric/Biz/Org/Person.pm
    bricolage/trunk/lib/Bric/Biz/Org/Source.pm
    bricolage/trunk/lib/Bric/Biz/Org.pm
    bricolage/trunk/lib/Bric/Biz/OutputChannel/Element.pm
    bricolage/trunk/lib/Bric/Biz/OutputChannel.pm
    bricolage/trunk/lib/Bric/Biz/Person/User.pm
    bricolage/trunk/lib/Bric/Biz/Person.pm
    bricolage/trunk/lib/Bric/Biz/Site.pm
    bricolage/trunk/lib/Bric/Biz/Workflow/Parts/Desk.pm
    bricolage/trunk/lib/Bric/Biz/Workflow.pm
    bricolage/trunk/lib/Bric/Changes.pod
    bricolage/trunk/lib/Bric/Dist/ActionType.pm
    bricolage/trunk/lib/Bric/Dist/ServerType.pm
    bricolage/trunk/lib/Bric/ToDo.pod
    bricolage/trunk/lib/Bric/Util/AlertType.pm
    bricolage/trunk/lib/Bric/Util/Coll/Site.pm
    bricolage/trunk/lib/Bric/Util/EventType.pm
    bricolage/trunk/lib/Bric/Util/Grp/Parts/Member/Contrib.pm
    bricolage/trunk/lib/Bric/Util/Grp/Parts/Member.pm
    bricolage/trunk/lib/Bric/Util/Grp.pm
    bricolage/trunk/lib/Bric/Util/Job.pm
    bricolage/trunk/lib/Bric/Util/MediaType.pm
    bricolage/trunk/lib/Bric/Util/Pref.pm
    bricolage/trunk/lib/Bric/Util/Priv.pm
    bricolage/trunk/lib/Bric/Util/UserPref.pm
    bricolage/trunk/sql/Pg/Bric/Biz/ATType.sql
    bricolage/trunk/sql/Pg/Bric/Biz/ATType.val
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.val
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Container.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Data.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.val
    bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.sql
    bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.val
    bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql
    bricolage/trunk/sql/Pg/Bric/Biz/AssetType.val
    bricolage/trunk/sql/Pg/Bric/Biz/Category.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Category.val
    bricolage/trunk/sql/Pg/Bric/Biz/Contact.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Contact.val
    bricolage/trunk/sql/Pg/Bric/Biz/Keyword.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.val
    bricolage/trunk/sql/Pg/Bric/Biz/Org/Person.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.val
    bricolage/trunk/sql/Pg/Bric/Biz/Org.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Org.val
    bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.sql
    bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.val
    bricolage/trunk/sql/Pg/Bric/Biz/Person/User.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Person/User.val
    bricolage/trunk/sql/Pg/Bric/Biz/Person.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Person.val
    bricolage/trunk/sql/Pg/Bric/Biz/Site.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Site.val
    bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.val
    bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql
    bricolage/trunk/sql/Pg/Bric/Biz/Workflow.val
    bricolage/trunk/sql/Pg/Bric/Dist/Action.sql
    bricolage/trunk/sql/Pg/Bric/Dist/ActionType.sql
    bricolage/trunk/sql/Pg/Bric/Dist/ActionType.val
    bricolage/trunk/sql/Pg/Bric/Dist/Resource.sql
    bricolage/trunk/sql/Pg/Bric/Dist/Server.sql
    bricolage/trunk/sql/Pg/Bric/Dist/ServerType.sql
    bricolage/trunk/sql/Pg/Bric/Util/Alert.sql
    bricolage/trunk/sql/Pg/Bric/Util/AlertType/Parts/Rule.sql
    bricolage/trunk/sql/Pg/Bric/Util/AlertType.sql
    bricolage/trunk/sql/Pg/Bric/Util/Alerted.sql
    bricolage/trunk/sql/Pg/Bric/Util/Async.sql
    bricolage/trunk/sql/Pg/Bric/Util/Attribute.sql
    bricolage/trunk/sql/Pg/Bric/Util/Class.sql
    bricolage/trunk/sql/Pg/Bric/Util/Class.val
    bricolage/trunk/sql/Pg/Bric/Util/Event.sql
    bricolage/trunk/sql/Pg/Bric/Util/EventType.sql
    bricolage/trunk/sql/Pg/Bric/Util/EventType.val
    bricolage/trunk/sql/Pg/Bric/Util/Grp/AlertType.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/ContribType.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/Org.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Grp_Member.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member/Contrib.val
    bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member_Attr.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/Source.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp/User.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp.sql
    bricolage/trunk/sql/Pg/Bric/Util/Grp.val
    bricolage/trunk/sql/Pg/Bric/Util/Grp_Attr.sql
    bricolage/trunk/sql/Pg/Bric/Util/Job.sql
    bricolage/trunk/sql/Pg/Bric/Util/Language.sql
    bricolage/trunk/sql/Pg/Bric/Util/MediaType.sql
    bricolage/trunk/sql/Pg/Bric/Util/MediaType.val
    bricolage/trunk/sql/Pg/Bric/Util/Pref.sql
    bricolage/trunk/sql/Pg/Bric/Util/Pref.val
    bricolage/trunk/sql/Pg/Bric/Util/Priv.sql
    bricolage/trunk/sql/Pg/Bric/Util/Priv.val
    bricolage/trunk/sql/Pg/Bric.sql
    bricolage/trunk/t/Bric/Util/DBI/DevTest.pm
    bricolage/trunk/t/Bric/Util/Grp/DevTest.pm
    bricolage/trunk/t/Bric/Util/Pref/DevTest.pm

Added Files:
-----------
    bricolage/trunk/inst/upgrade/1.9.0/no_more_numeric.pl



["r6066-theory.diff" (r6066-theory.diff)]

Modified: bricolage/trunk/inst/upgrade/1.9.0/add_alpha_search_pref.pl
===================================================================
--- bricolage/trunk/inst/upgrade/1.9.0/add_alpha_search_pref.pl	2004-11-09 02:58:13 \
                UTC (rev 6065)
+++ bricolage/trunk/inst/upgrade/1.9.0/add_alpha_search_pref.pl	2004-11-09 03:32:57 \
UTC (rev 6066) @@ -11,10 +11,10 @@
 do_sql
 
   "INSERT INTO pref (id, name, description, value, def, manual, opt_type, \
                can_be_overridden)
-   VALUES (17, 'Show Alpha Search', 'Show links to filter search results by the \
first letter.', '0', '0', 0, 'select', 0)", +   VALUES (17, 'Show Alpha Search', \
'Show links to filter search results by the first letter.', '0', '0', 0, 'select', \
'0')",  
   "INSERT INTO member (id, grp__id, class__id, active)
-   VALUES (903, 22, 48, 1)",
+   VALUES (903, 22, 48, '1')",
 
   "INSERT INTO pref_member (id, object_id, member__id)
    VALUES (17, 17, 903)",

Added: bricolage/trunk/inst/upgrade/1.9.0/no_more_numeric.pl
===================================================================
--- bricolage/trunk/inst/upgrade/1.9.0/no_more_numeric.pl	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/inst/upgrade/1.9.0/no_more_numeric.pl	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -0,0 +1,101 @@
+#!/usr/bin/perl -w
+
+use strict;
+use File::Spec::Functions qw(catfile);
+use File::Copy qw(mv);
+
+our $PG;
+do "./postgres.db" or die "Failed to read postgres.db: $!";
+
+$ENV{PGUSER} = $PG->{root_user};
+$ENV{PGPASSWORD} = $PG->{root_pass};
+$ENV{PGHOST} = $PG->{host_name} if $PG->{host_name};
+$ENV{PGPORT} = $PG->{host_port} if $PG->{host_port};
+
+# See if we get a boolean value instead of a number.
+my (undef, $val) = `$PG->{psql} -q -c 'select active from person LIMIT 1;' -d \
'$PG->{db_name}' -P format=unaligned -P pager= -P footer=`; +chomp $val;
+exit if $val eq 't' || $val eq 'f';
+
+# XXX Insert ask_y_n question here.
+
+# Okay, this database needs upgrading.
+my $old_file = catfile('inst', 'upgrade.dmp');
+my $new_file = catfile('inst', 'upgrade.sql');
+my $sql_file = catfile('inst', 'Pg.sql');
+my $tmp_file = "$sql_file.tmp";
+
+# Dump database.
+print "Dumping database. This could take a while...";
+system(catfile($PG->{bin_dir}, 'pg_dump'), '-U', $PG->{root_user},
+       '-O', '-x', $PG->{db_name}, '-f', $old_file, '--create');
+print "\nParsing datbase...";
+open OLD, "<$old_file" or die "Cannot open '$old_file: $!\n";
+open NEW, ">$new_file" or die "Cannot open '$new_file: $!\n";
+my $last = '';
+while (<OLD>) {
+    # Stop this craziness once we get to the data section.
+    last if /^-- Data/;
+    # Skip the old boolean checks.
+    next if /CHECK\s*\(\(\(\w+\s*=\s*\([01]\)::numeric\)\s*OR\s*\(\w+\s*=\s*\([01]\)::numeric\)\)\)/;
 +    # Handle functions and such.
+    unless (s/numeric([),])/integer$1/g) {
+        # Handle special smallint columns.
+        unless (s/(uri_case|tplate_type|ord|priority|place|burner|uri_case|tries|"type")\s+numeric\([123],0\)/$1 \
smallint/) { +            # Handle old standard numeric(10,0) columns.
+            unless (s/numeric\(10,0\)/integer/) {
+                # Handle other smallints.
+                unless (s/numeric\([234],0\)/smallint/) {
+                    # A numeric(1,0) is either boolean or smallint. Decide
+                    # based on the default.
+                    if (/^\s+"?\w+"?\s+numeric\(1,\s*0\)/i) {
+                        if (/default\s+[2-9]/i) {
+                            s/^(\s+"?\w+"?)\s+numeric\(1,\s*0\)/$1 smallint/i;
+                        } else {
+                            s/^(\s+"?\w+"?)\s+numeric\(1,\s*0\)/$1 boolean/i;
+                            s/DEFAULT\s+0/DEFAULT false/i
+                              unless s/DEFAULT\s+1/DEFAULT true/i;
+                        }
+                    } else {
+                        # Just replace any remaining NUMERIC casts with integer \
casts. +                        s/::numeric/::integer/g
+                          unless s/^(\s+"?\w+"?)\s+numeric\(\d+,\s*0\)/$1 integer/i;
+                    }
+                }
+            }
+        }
+        # Remove commas from the last line of of a statement.
+        $last =~ s/,$// if $_ =~ /^\);/;
+    }
+
+    # Print the previouis line.
+    print NEW $last;
+    $last = $_;
+}
+
+# Print the current line.
+print NEW $last, $_;
+# Fix the casts in the rest of the file.
+while (<OLD>) {
+    s/::numeric/::integer/g
+      unless s/active\s*=\s*\(1\)::numeric/active = ('t')::bool/;
+    print NEW $_;
+}
+
+close OLD;
+close NEW;
+unlink $old_file;
+mv $sql_file, $tmp_file;
+mv $new_file, $sql_file;
+
+print "\nDropping old database...";
+system($PG->{psql}, '-d', 'template1', '-c', qq{DROP DATABASE "$PG->{db_name}"});
+my $perl = $ENV{PERL} || $^X;
+system $perl, catfile 'inst', 'db.pl';
+mv $sql_file, $new_file;
+mv $tmp_file, $sql_file;
+
+__END__
+  % grep -lri 'active[[:space:]]*=[[:space:]]*[01]' lib \
+    | grep -v .svn | xargs \
+    perl -i.bak -pe "s/active\s*=\s*([01])/active = '\$1'/ig"


Property changes on: bricolage/trunk/inst/upgrade/1.9.0/no_more_numeric.pl
___________________________________________________________________
Name: svn:executable
   + *
Name: snv:mime-type
   + text/plain
Name: svn:keywords
   + Id

Modified: bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm
===================================================================
--- bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/inst/upgrade/lib/bric_upgrade.pm	2004-11-09 03:32:57 UTC (rev \
6066) @@ -266,14 +266,18 @@
 a constraint rather than a C<NOT NULL> in the statement that created the
 column.
 
+An optional fifth argument specifies the column type. The function will return
+true if the column exists and is of the specified type. Typical examples
+include "integer", "smallint", "boolean", "text", and "character varying(64)".
+
 Of course, if both optional arguments are passed to C<test_column()>, it will
 test that the column exists, that it is at least the size specified, and that
 it is C<NOT NULL>.
 
 =cut
 
-sub test_column($$;$$) {
-    my ($table, $column, $size, $not_null) = @_;
+sub test_column($$;$$$) {
+    my ($table, $column, $size, $not_null, $type) = @_;
     my $sql = qq{
         SELECT 1
         FROM   pg_attribute a, pg_class c
@@ -294,6 +298,11 @@
         $sql .= "           AND a.attnotnull = '$not_null'";
     }
 
+    if (defined $type) {
+        $sql .= "           AND format_type(a.atttypid, a.atttypmod) = '"
+          . lc $type . "'";
+    }
+
     return fetch_sql($sql)
 }
 

Modified: bricolage/trunk/lib/Bric/Biz/ATType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/ATType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/ATType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1121,7 +1121,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = "$TABLE a, member m, element_type_member c";
     my $wheres = 'a.id = c.object_id AND c.member__id = m.id ' .
-      'AND m.active = 1';
+      "AND m.active = '1'";
     my @params;
 
     # Set the active parameter, if necessary.
@@ -1151,7 +1151,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, element_type_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } else {
             # It's a boolean comparison.

Modified: bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Business/Media.pm	2004-11-09 03:32:57 UTC (rev \
6066) @@ -164,7 +164,7 @@
 use constant WHERE => 'mt.id = i.media__id '
   . 'AND mm.object_id = mt.id '
   . 'AND m.id = mm.member__id '
-  . 'AND m.active = 1 '
+  . "AND m.active = '1' "
   . 'AND c.id = i.category__id '
   . 'AND e.id = mt.element__id '
   . 'AND at.id = e.type__id '
@@ -232,10 +232,11 @@
       file_name             => 'LOWER(i.file_name) LIKE LOWER(?)',
       location              => 'LOWER(i.location) LIKE LOWER(?)',
       _checked_in_or_out    => 'i.checked_out = '
-                             . '( SELECT max(checked_out) '
+                             . '( SELECT checked_out '
                              . 'FROM media_instance '
                              . 'WHERE version = i.version '
-                             . 'AND media__id = i.media__id)',
+                             . 'AND media__id = i.media__id '
+                             . 'ORDER BY checked_out DESC LIMIT 1 )',
       _checked_out          => 'i.checked_out = ?',
       primary_oc_id         => 'i.primary_oc__id = ?',
       output_channel_id     => '(i.id = moc.media_instance__id AND '
@@ -250,7 +251,7 @@
                              . 'LOWER(k.name) LIKE LOWER(?)',
       _no_return_versions   => 'mt.current_version = i.version',
       grp_id                => 'm2.grp__id = ? AND '
-                             . 'm2.active = 1 AND '
+                             . "m2.active = '1' AND "
                              . 'mm2.member__id = m2.id AND '
                              . 'mt.id = mm2.object_id',
       simple                => 'mt.id IN ('
@@ -278,7 +279,7 @@
                                 'LOWER(c.uri) LIKE LOWER(?)' ],
     keyword                => [ 'mk.media_id = mt.id AND k.id = mk.keyword_id',
                                 'LOWER(k.name) LIKE LOWER(?)' ],
-    grp_id                 => [ 'm2.active = 1 AND mm2.member__id = m2.id AND mt.id \
= mm2.object_id', +    grp_id                 => [ "m2.active = '1' AND \
mm2.member__id = m2.id AND mt.id = mm2.object_id",  'm2.grp__id = ?' ],
     contrib_id             => [ 'i.id = sic.media_instance__id',
                                 'sic.member__id = ?' ],

Modified: bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Business/Story.pm	2004-11-09 03:32:57 UTC (rev \
6066) @@ -271,7 +271,7 @@
 use constant WHERE => 's.id = i.story__id '
   . 'AND sm.object_id = s.id '
   . 'AND m.id = sm.member__id '
-  . 'AND m.active = 1 '
+  . "AND m.active = '1' "
   . 'AND sc.story_instance__id = i.id '
   . 'AND c.id = sc.category__id '
   . 'AND s.workflow__id = w.id';
@@ -342,10 +342,11 @@
       user__id               => 'i.usr__id = ?',
       user_id                => 'i.usr__id = ?',
       _checked_in_or_out     => 'i.checked_out = '
-                              . '( SELECT max(checked_out) '
+                             . '( SELECT checked_out '
                               . 'FROM story_instance '
                               . 'WHERE version = i.version '
-                              . 'AND story__id = i.story__id )',
+                              . 'AND story__id = i.story__id '
+                              . 'ORDER BY checked_out DESC LIMIT 1 )',
       _checked_out           => 'i.checked_out = ?',
       primary_oc_id          => 'i.primary_oc__id = ?',
       output_channel_id      => '(i.id = soc.story_instance__id AND '
@@ -366,18 +367,19 @@
                               . 'WHERE  i2.story__id = s2.id '
                               . 'AND i2.version = s2.current_version '
                               . 'AND i2.checked_out =('
-                              . 'SELECT MAX(checked_out) '
+                             . '( SELECT checked_out '
                               . 'FROM story_instance '
                               . 'WHERE version = i2.version '
-                              . 'AND story__id = s2.id ) '
+                              . 'AND story__id = s2.id '
                               . 'AND sc3.story_instance__id = i2.id '
-                              . 'AND s2.id = ?)',
+                              . 'AND s2.id = ? '
+                              . 'ORDER BY checked_out DESC LIMIT 1 )',
       keyword                => 'sk.story_id = s.id AND '
                               . 'k.id = sk.keyword_id AND '
                               . 'LOWER(k.name) LIKE LOWER(?)',
       _no_return_versions    => 's.current_version = i.version',
       grp_id                 => 'm2.grp__id = ? AND '
-                              . 'm2.active = 1 AND '
+                              . "m2.active = '1' AND "
                               . 'sm2.member__id = m2.id AND '
                               . 's.id = sm2.object_id',
       simple                 => 's.id IN ('
@@ -409,7 +411,7 @@
                                 'LOWER(c.uri) LIKE LOWER(?)' ],
     keyword                => [ 'sk.story_id = s.id AND k.id = sk.keyword_id',
                                 'LOWER(k.name) LIKE LOWER(?)' ],
-    grp_id                 => [ 'm2.active = 1 AND sm2.member__id = m2.id AND s.id = \
sm2.object_id', +    grp_id                 => [ "m2.active = '1' AND sm2.member__id \
= m2.id AND s.id = sm2.object_id",  'm2.grp__id = ?' ],
     contrib_id             => [ 'i.id = sic.story_instance__id',
                                 'sic.member__id = ?' ],

Modified: bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/lib/Bric/Biz/Asset/Formatting.pm	2004-11-09 03:32:57 UTC (rev \
6066) @@ -223,7 +223,7 @@
 use constant WHERE => 'f.id = i.formatting__id '
   . 'AND fm.object_id = f.id '
   . 'AND m.id = fm.member__id '
-  . 'AND m.active = 1 '
+  . "AND m.active = '1' "
   . 'AND c.id = f.category__id '
   . 'AND f.workflow__id = w.id';
 
@@ -274,16 +274,17 @@
       user__id              => 'i.usr__id = ?',
       user_id               => 'i.usr__id = ?',
       _checked_in_or_out    => 'i.checked_out = '
-                             . '( SELECT max(checked_out) '
+                             . '( SELECT checked_out '
                              . 'FROM formatting_instance '
                              . 'WHERE version = i.version '
-                             . 'AND formatting__id = i.formatting__id )',
+                             . 'AND formatting__id = i.formatting__id '
+                             . 'ORDER BY checked_out DESC LIMIT 1 )',
       _checked_out          => 'i.checked_out = ?',
       category_id           => 'f.category__id = ?',
       category_uri          => 'f.category__id = c.id AND '
                              . 'LOWER(c.uri) LIKE LOWER(?))',
       _no_return_versions   => 'f.current_version = i.version',
-      grp_id                => 'm2.active = 1 AND '
+      grp_id                => "m2.active = '1' AND "
                              . 'm2.grp__id = ? AND '
                              . 'f.id = fm2.object_id AND '
                              . 'fm2.member__id = m2.id',
@@ -296,7 +297,7 @@
                                 'e.key_name LIKE LOWER(?)' ],
     category_uri           => [ 'f.category__id = c.id',
                                 'LOWER(c.uri) LIKE LOWER(?))' ],
-    grp_id                 => [ 'm2.active = 1 AND fm2.member__id = m2.id AND f.id = \
fm2.object_id', +    grp_id                 => [ "m2.active = '1' AND fm2.member__id \
= m2.id AND f.id = fm2.object_id",  'm2.grp__id = ?' ],
 };
 

Modified: bricolage/trunk/lib/Bric/Biz/AssetType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/AssetType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/AssetType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -2445,7 +2445,7 @@
     my ($pkg, $params, $ids) = @_;
     my $tables = "$table a, $mem_table m, $map_table c";
     my @wheres = ('a.id = c.object_id', 'c.member__id = m.id',
-                  'm.active = 1');
+                  "m.active = '1'");
     my ($top, @params);
 
     # Set up the active parameter.
@@ -2506,12 +2506,12 @@
             # Fancy-schmancy second join.
             $tables .= ", $mem_table m2, $map_table c2";
             push @wheres, ('a.id = c2.object_id', 'c2.member__id = m2.id',
-                            'm2.active = 1', 'm2.grp__id = ?');
+                           "m2.active = '1'", 'm2.grp__id = ?');
             push @params, $v;
         } elsif ($k eq 'site_id') {
             $tables .= ", element__site es";
             push @wheres, ('es.element__id = a.id','es.site__id = ?',
-                           'es.active = 1');
+                           "es.active = '1'");
             push @params, $v;
         } else {
             # The "name" and "description" properties.

Modified: bricolage/trunk/lib/Bric/Biz/Category.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Category.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Category.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1541,7 +1541,7 @@
 sub _do_list {
     my ($pkg, $params, $ids) = @_;
     my $tables = "$table a, $mem_table m, $map_table c";
-    my $wheres = 'a.id = c.object_id AND c.member__id = m.id AND m.active = 1 '.
+    my $wheres = "a.id = c.object_id AND c.member__id = m.id AND m.active = '1' ".
                  'AND a.id <> 0';
     my @params;
 
@@ -1576,7 +1576,7 @@
             # Fancy-schmancy second join.
             $tables .= ", $mem_table m2, $map_table c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id " .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
 	} else {
             # It's a simpler string comparison.

Modified: bricolage/trunk/lib/Bric/Biz/Contact.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Contact.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Contact.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1390,7 +1390,7 @@
         }
     }
 
-    my $where = defined $params->{id} ? '' : ' AND v.active = 1';
+    my $where = defined $params->{id} ? '' : " AND v.active = '1'";
     local $" = ' AND ';
     $where .= " AND @wheres" if @wheres;
 
@@ -1505,7 +1505,7 @@
     my $sel = prepare_ca(qq{
         SELECT @qry_cols
         FROM   contact c
-        WHERE  active = 1 $where
+        WHERE  active = '1' $where
         ORDER BY c.id
     }, undef);
 

Modified: bricolage/trunk/lib/Bric/Biz/Keyword.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Keyword.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Keyword.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -688,7 +688,7 @@
     my ($invocant, $params, $ids_only, $href) = @_;
     my $tables = "$TABLE a, member m, keyword_member c";
     my $wheres = 'a.id = c.object_id AND c.member__id = m.id AND ' .
-      'm.active = 1';
+      "m.active = '1'";
     my @params;
 
     foreach my $k (keys %$params) {
@@ -704,7 +704,7 @@
             # Look up by group membership.
             $tables .= ", member m2, keyword_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $params->{$k};
         } elsif ($k eq 'object') {
             # Look up by object association.

Modified: bricolage/trunk/lib/Bric/Biz/Org/Parts/Addr.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Org/Parts/Addr.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Org/Parts/Addr.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -524,7 +524,7 @@
     my $sel = prepare_ca(qq{
         SELECT name
         FROM   addr_part_type
-        WHERE  active = 1
+        WHERE  active = '1'
         ORDER BY id
     }, undef);
     return wantarray ? @{ col_aref($sel) } : col_aref($sel);
@@ -1505,7 +1505,7 @@
     }
 
     # Make sure the records are active unless an ID is specified.
-    my $where = defined $args->{id} ? '' : 'a.active = 1 ';
+    my $where = defined $args->{id} ? '' : "a.active = '1' ";
 
     # Put together the where statement.
     local $" = ' = ? AND ';

Modified: bricolage/trunk/lib/Bric/Biz/Org/Person.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Org/Person.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Org/Person.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1459,7 +1459,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = 'person_org po, org o, member m, org_member c';
     my $wheres = 'po.org__id = o.id AND o.id = c.object_id ' .
-      'AND m.id = c.member__id AND m.active = 1';
+      "AND m.id = c.member__id AND m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($NUM_MAP{$k}) {
@@ -1472,13 +1472,13 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, org_member c2";
             $wheres .= " AND o.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         }
     }
 
     # Make sure it's active unless and ID has been passed.
-    $wheres .= "AND po.active = 1" unless defined $params->{id};
+    $wheres .= "AND po.active = '1'" unless defined $params->{id};
 
     # Assemble and prepare the query.
     my $qry_cols = $ids ? \'DISTINCT po.id' : \$SEL_COLS;

Modified: bricolage/trunk/lib/Bric/Biz/Org/Source.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Org/Source.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Org/Source.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1213,7 +1213,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = 'source s, org o, member m, source_member c';
     my $wheres = 's.org__id = o.id AND s.id = c.object_id ' .
-      'AND m.active = 1 AND m.id = c.member__id';
+      "AND m.active = '1' AND m.id = c.member__id";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'id' or $k eq 'expire') {
@@ -1232,7 +1232,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, source_member c2";
             $wheres .= " AND s.id = c2.object_id AND c2.member__id = m2.id " .
-              "AND m2.active = 1 AND m2.grp__id = ?";
+              "AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } else {
             # We're horked.
@@ -1244,7 +1244,7 @@
     # Make sure it's active unless and ID has been passed.
     # XXX Allow all. I will never again implicitly add search parameters to
     # an API.
-    $wheres .= " AND s.active = 1" unless defined $params->{id}
+    $wheres .= " AND s.active = '1'" unless defined $params->{id}
       || $params->{all};
 
     # Assemble and prepare the query.

Modified: bricolage/trunk/lib/Bric/Biz/Org.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Org.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Org.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1252,7 +1252,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = 'org a, member m, org_member c';
     my $wheres = 'a.id = c.object_id AND m.id = c.member__id ' .
-      'AND m.active = 1';
+      "AND m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'id') {
@@ -1267,7 +1267,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, org_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } else {
             # Simple string comparison.
@@ -1277,7 +1277,7 @@
     }
 
     # Make sure it's active unless and ID has been passed.
-    $wheres .= "AND a.active = 1" unless defined $params->{id};
+    $wheres .= "AND a.active = '1'" unless defined $params->{id};
 
     # Assemble and prepare the query.
     my ($qry_cols, $order) = $ids ? (\'DISTINCT a.id', 'a.id') :

Modified: bricolage/trunk/lib/Bric/Biz/OutputChannel/Element.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/OutputChannel/Element.pm	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/OutputChannel/Element.pm	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -467,7 +467,7 @@
             SET    output_channel__id = ?,
                    element__id = ?,
                    enabled = ?,
-                   active = 1
+                   active = '1'
             WHERE  id = ?
         }, undef);
         execute($upd, $ocid, $eid, $en, $map_id);
@@ -478,7 +478,7 @@
         my $ins = prepare_c(qq{
             INSERT INTO element__output_channel
                         (id, element__id, output_channel__id, enabled, active)
-            VALUES ($nextval, ?, ?, ?, 1)
+            VALUES ($nextval, ?, ?, ?, '1')
         }, undef);
         execute($ins, $eid, $ocid, $en);
         $self->_set(['_map_id'], [last_key('element__output_channel')]);

Modified: bricolage/trunk/lib/Bric/Biz/OutputChannel.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/OutputChannel.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/OutputChannel.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -139,7 +139,7 @@
 my $TABLE = 'output_channel';
 my $SEL_TABLES = "$TABLE oc, member m, output_channel_member sm";
 my $SEL_WHERES = 'oc.id = sm.object_id AND sm.member__id = m.id ' .
-  'AND m.active = 1';
+  "AND m.active = '1'";
 my $SEL_ORDER = 'oc.name, oc.id';
 
 my @COLS = qw(name description protocol site__id pre_path post_path primary_ce
@@ -1691,7 +1691,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, output_channel_member c2";
             $wheres .= " AND oc.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'include_parent_id') {
             # Include the parent ID.

Modified: bricolage/trunk/lib/Bric/Biz/Person/User.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Person/User.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Person/User.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -504,7 +504,7 @@
         SELECT 1
         FROM   usr
         WHERE  LOWER(login) = ?
-               AND active = 1
+               AND active = '1'
     }, undef);
 
     return 1 unless @{ row_aref($sel, lc $login) || [] };
@@ -1450,7 +1450,7 @@
     my ($pkg, $args, $ids) = @_;
     my $tables = 'person p, usr u, member m, user_member c';
     my $wheres = 'p.id = u.id AND u.id = c.object_id AND ' .
-      'c.member__id = m.id AND m.active = 1';
+      "c.member__id = m.id AND m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$args) {
         if ($k eq 'id') {
@@ -1462,7 +1462,7 @@
         } elsif ($k eq 'grp_id') {
             $tables .= ", member m2, user_member c2";
             $wheres .= " AND u.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'active') {
             $wheres .= " AND u.$k = ?";
@@ -1473,7 +1473,7 @@
         }
     }
 
-    $wheres .= ' AND u.active = 1' unless defined $args->{id}
+    $wheres .= " AND u.active = '1'" unless defined $args->{id}
       or exists $args->{active};
     my ($qry_cols, $order) = $ids ? (\'DISTINCT u.id', 'u.id') :
       (\$sel_cols, 'LOWER(p.lname), LOWER(p.fname), LOWER(p.mname), u.id');

Modified: bricolage/trunk/lib/Bric/Biz/Person.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Person.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Person.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1804,7 +1804,7 @@
         } elsif ($k eq 'grp_id') {
             $extra_tables = ", $mem_table m2, $map_table c2";
             $extra_wheres = "AND p.id = c2.object_id AND " .
-              "m2.active = 1 AND c2.member__id = m2.id";
+              "m2.active = '1' AND c2.member__id = m2.id";
             push @wheres, "m2.grp__id = ?";
             push @params, $v;
         } else {
@@ -1813,7 +1813,7 @@
         }
     }
 
-    my $where = defined $params->{id} ? '' : 'p.active = 1';
+    my $where = defined $params->{id} ? '' : "p.active = '1'";
     $where .= ($where ? ' AND ' : '') . join(' AND ', @wheres) if @wheres;
 
     local $" = ', ';
@@ -1822,7 +1822,7 @@
     my $sel = prepare_c(qq{
         SELECT @$qry_cols
         FROM   $table p, $mem_table m, $map_table c $extra_tables
-        WHERE  p.id = c.object_id AND c.member__id = m.id and m.active = 1
+        WHERE  p.id = c.object_id AND c.member__id = m.id and m.active = '1'
                $extra_wheres AND $where
         ORDER BY $order
     }, undef);

Modified: bricolage/trunk/lib/Bric/Biz/Site.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Site.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Site.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -782,7 +782,7 @@
     my ($invocant, $params, $ids_only, $href) = @_;
     my $tables = "$TABLE a, member m, site_member c";
     my $wheres = 'a.id = c.object_id AND c.member__id = m.id AND ' .
-      'm.active = 1';
+      "m.active = '1'";
     my @params;
 
     foreach my $k (keys %$params) {
@@ -798,12 +798,12 @@
             # Look up by group membership.
             $tables .= ", member m2, site_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $params->{$k};
         } elsif ($k eq 'element_id') {
             # Look up by element association.
             $tables .= ", element__site es";
-            $wheres .= " AND a.id = es.site__id AND es.element__id = ? AND es.active \
= 1"; +            $wheres .= " AND a.id = es.site__id AND es.element__id = ? AND \
es.active = '1'";  push @params, $params->{$k};
         } elsif ($k eq 'output_channel_id') {
             # Look up by output channel association.

Modified: bricolage/trunk/lib/Bric/Biz/Workflow/Parts/Desk.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Workflow/Parts/Desk.pm	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/lib/Bric/Biz/Workflow/Parts/Desk.pm	2004-11-09 03:32:57 UTC (rev \
6066) @@ -1415,7 +1415,7 @@
 
     my $tables = "$TABLE a, member m, desk_member c";
     my $wheres = 'a.id = c.object_id AND c.member__id = m.id AND ' .
-      'm.active = 1';
+      "m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'name' or $k eq 'description') {
@@ -1424,7 +1424,7 @@
         } elsif ($k eq 'grp_id') {
             $tables .= ", member m2, desk_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } else {
             $wheres .= " AND a.$k = ?";

Modified: bricolage/trunk/lib/Bric/Biz/Workflow.pm
===================================================================
--- bricolage/trunk/lib/Bric/Biz/Workflow.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Biz/Workflow.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1391,7 +1391,7 @@
 
     my $tables = "$table a, member m, workflow_member c";
     my $wheres = 'a.id = c.object_id AND c.member__id = m.id AND ' .
-      'm.active = 1';
+      "m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'name' or $k eq 'description') {
@@ -1400,7 +1400,7 @@
         } elsif ($k eq 'grp_id') {
             $tables .= ", member m2, workflow_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'desk_id') {
             # Yes, this is a hack. It requires too much knowledge of the Group
@@ -1408,7 +1408,7 @@
             # refactored out of it.
             $tables .= ", member m3, desk_member c3";
             $wheres .= ' AND a.all_desk_grp_id = m3.grp__id AND ' .
-              'm3.id = c3.member__id AND m3.active = 1 AND ' .
+              "m3.id = c3.member__id AND m3.active = '1' AND " .
               'c3.object_id = ?';
             push @params, $v;
         } elsif($k eq 'site_id') {

Modified: bricolage/trunk/lib/Bric/Changes.pod
===================================================================
--- bricolage/trunk/lib/Bric/Changes.pod	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Changes.pod	2004-11-09 03:32:57 UTC (rev 6066)
@@ -109,6 +109,12 @@
 The "User Override" screen has been integrated into the "Users" screen
 since the two pages are mostly redundant except for a few links. [Marshall]
 
+=item *
+
+All of the old "NUMERIC" columns have been removed from the database and
+replaced with the more appropriate (and faster) "INTEGER", "SMALLINT", and
+"BOOLEAN" data types. [Neil Conway & David]
+
 =back
 
 =head1 VERSION 1.8.3 ()

Modified: bricolage/trunk/lib/Bric/Dist/ActionType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Dist/ActionType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Dist/ActionType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -734,7 +734,7 @@
     }
 
     # Assemble the WHERE clause.
-    push @wheres, "a.active = 1" if $params->{id};
+    push @wheres, "a.active = '1'" if $params->{id};
     my $where = @wheres ? "\n               AND " . join ' AND ', @wheres : '';
 
     # Assemble and prepare the query.

Modified: bricolage/trunk/lib/Bric/Dist/ServerType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Dist/ServerType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Dist/ServerType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -553,7 +553,7 @@
     my $sel = prepare_ca(qq{
         SELECT disp_name
         FROM   class
-        WHERE  distributor = 1 $and_sftp $and_dav
+        WHERE  distributor = '1' $and_sftp $and_dav
         ORDER BY disp_name
     }, undef);
     return wantarray ? @{ col_aref($sel) } : col_aref($sel);
@@ -2136,7 +2136,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = 'server_type s, class c, member m, dest_member sm';
     my $wheres = 's.class__id = c.id AND s.id = sm.object_id AND ' .
-      'sm.member__id = m.id AND m.active = 1';
+      "sm.member__id = m.id AND m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'id') {
@@ -2167,7 +2167,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, dest_member sm2";
             $wheres .= " AND s.id = sm2.object_id AND sm2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'site_id') {
             $wheres .= " AND s.site__id = ?";

Modified: bricolage/trunk/lib/Bric/ToDo.pod
===================================================================
--- bricolage/trunk/lib/Bric/ToDo.pod	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/ToDo.pod	2004-11-09 03:32:57 UTC (rev 6066)
@@ -240,7 +240,7 @@
            LIMIT  2
            OFFSET 1) AS p,
           member m, user_member c
-  WHERE  p.id = c.object_id AND c.member__id = m.id and m.active = 1;
+  WHERE  p.id = c.object_id AND c.member__id = m.id and m.active = '1';
 
 Obviously, you only change the query to use a derived table if the C<Limit> or
 C<Offset> parameter is passed to C<list()>.

Modified: bricolage/trunk/lib/Bric/Util/AlertType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/AlertType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/AlertType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -2561,8 +2561,8 @@
     my ($pkg, $params, $ids) = @_;
     my $tables = "$table a, $mem_table m, $map_table c";
     my @wheres = ('a.id = c.object_id','c.member__id = m.id',
-                  'm.active = 1');
-    push @wheres, "a.del = 0" unless exists $params->{id};
+                  "m.active = '1'");
+    push @wheres, "a.del = '0'" unless exists $params->{id};
 
     my @params;
     while (my ($k, $v) = each %$params) {
@@ -2573,7 +2573,7 @@
             # Fancy-schmancy second join.
             $tables .= ", $mem_table m2, $map_table c2";
             push @wheres, ('a.id = c2.object_id', 'c2.member__id = m2.id',
-                           'm2.active = 1', 'm2.grp__id = ?');
+                           "m2.active = '1'", 'm2.grp__id = ?');
             push @params, $v;
         } else {
             push @wheres, "LOWER(a.$k) LIKE ?";

Modified: bricolage/trunk/lib/Bric/Util/Coll/Site.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Coll/Site.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/Coll/Site.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -177,7 +177,7 @@
         if ($site->get_id) {
             my $upd = prepare_c( qq {
                 UPDATE element__site
-                SET    active = 0
+                SET    active = '0'
                 WHERE  element__id = ? AND
                        site__id    = ?
             }, undef, DEBUG);
@@ -199,7 +199,7 @@
         if (@$state) {
             my $upd = prepare_c( qq {
                 UPDATE element__site
-                SET    active = 1,
+                SET    active = '1',
                        primary_oc__id = ?
                 WHERE  element__id = ? AND
                        site__id    = ?

Modified: bricolage/trunk/lib/Bric/Util/EventType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/EventType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/EventType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1051,7 +1051,7 @@
         }
     }
 
-    my $where = defined $params->{id} ? '' : 'AND t.active = 1 ';
+    my $where = defined $params->{id} ? '' : "AND t.active = '1' ";
     local $" = ' AND ';
     $where .= "AND @wheres" if @wheres;
 

Modified: bricolage/trunk/lib/Bric/Util/Grp/Parts/Member/Contrib.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Grp/Parts/Member/Contrib.pm	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/Grp/Parts/Member/Contrib.pm	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -675,7 +675,7 @@
         FROM   member m, person_member pm, person p, grp g
         WHERE  m.id = pm.member__id
                AND m.grp__id = g.id
-               AND g.active = 1
+               AND g.active = '1'
                AND pm.object_id = p.id$where
         ORDER BY p.lname, p.fname, p.mname
     }, undef);

Modified: bricolage/trunk/lib/Bric/Util/Grp/Parts/Member.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Grp/Parts/Member.pm	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/lib/Bric/Util/Grp/Parts/Member.pm	2004-11-09 03:32:57 UTC (rev \
6066) @@ -1350,7 +1350,7 @@
         push @bind,  $object_class_id;
     }
     unless ($all) {
-        push @param, ' m.active=1 ';
+        push @param, " m.active = '1' ";
     }
     push @param, ' m.id=o.member__id ';
     $sql .= ' WHERE ' . join ( ' AND ', @param );

Modified: bricolage/trunk/lib/Bric/Util/Grp.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Grp.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/Grp.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -2838,7 +2838,7 @@
 sub _do_list {
     my ($class, $criteria, $ids, @params) = @_;
     my @wheres = ('g.id = c.object_id', 'c.member__id = m.id',
-                  'm.active = 1');
+                  "m.active = '1'");
     my $tables = "grp g, member m, grp_member c";
     # If an object is passed then we have to join to the member table again.
     if (($criteria->{obj}) ||
@@ -2860,7 +2860,7 @@
         # build the query
         $tables .= ", member mm, $motable mo";
         push @wheres, ( "mo.object_id = ? ", 'mo.member__id = mm.id',
-                        'mm.grp__id = g.id', 'mm.active = 1');
+                        'mm.grp__id = g.id', "mm.active = '1'");
         push @params, $obj_id;
 
         # If an active param has been passed in add it here remember that
@@ -2922,7 +2922,7 @@
     if (exists $criteria->{grp_id}) {
         $tables .= ", member m2, grp_member c2";
         push @wheres, ("g.id = c2.object_id", "c2.member__id = m2.id",
-                       "m2.active = 1", "m2.grp__id = ?");
+                       "m2.active = '1'", "m2.grp__id = ?");
         push @params, $criteria->{grp_id};
     }
 

Modified: bricolage/trunk/lib/Bric/Util/Job.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Job.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/Job.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1918,7 +1918,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = 'job a, member m, job_member c';
     my $wheres = 'a.id = c.object_id AND m.id = c.member__id AND ' .
-      'm.active = 1';
+      "m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'id') {
@@ -1959,7 +1959,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, job_member c2";
             $wheres .= " AND a.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'type') {
             # Boolean

Modified: bricolage/trunk/lib/Bric/Util/MediaType.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/MediaType.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/MediaType.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1209,7 +1209,7 @@
     my $tables = 'media_type a LEFT JOIN media_type_ext e ' .
       'ON a.id = e.media_type__id, member m, media_type_member am';
     my $wheres = 'a.id = am.object_id ' .
-      'AND am.member__id = m.id AND m.active = 1';
+      "AND am.member__id = m.id AND m.active = '1'";
     my @params;
 
     while (my ($k, $v) = each %$params) {
@@ -1221,7 +1221,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, media_type_member am2";
             $wheres .= " AND a.id = am2.object_id AND am2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } else {
             # It's a varchar field.

Modified: bricolage/trunk/lib/Bric/Util/Pref.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Pref.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/Pref.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1293,7 +1293,7 @@
     my ($pkg, $params, $ids, $href) = @_;
     my $tables = 'pref p, pref_opt o, member m, pref_member c';
     my $wheres = 'p.id = o.pref__id AND p.value = o.value ' .
-      'AND p.id = c.object_id AND m.id = c.member__id AND m.active = 1';
+      "AND p.id = c.object_id AND m.id = c.member__id AND m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'id' or $k eq 'manual') {
@@ -1306,7 +1306,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, pref_member c2";
             $wheres .= " AND p.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'can_be_overridden') {
             $wheres .= " AND p.can_be_overridden = ?";

Modified: bricolage/trunk/lib/Bric/Util/Priv.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/Priv.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/Priv.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -521,11 +521,11 @@
         WHERE  gp.id = gm.grp_priv__id
                AND g.id = m.grp__id
                AND gp.grp__id = g.id
-               AND g.active = 1
+               AND g.active = '1'
                AND gm.grp__id = gg.id
-               AND gg.active = 1
+               AND gg.active = '1'
                AND m.id = mo.member__id
-               AND m.active = 1
+               AND m.active = '1'
                AND mo.object_id = ?
        ORDER BY gm.grp__id, gp.value
     }, undef);
@@ -583,12 +583,12 @@
                user_member mo, grp gg
         WHERE  gp.id = gm.grp_priv__id
                AND gp.grp__id = g.id
-               AND g.active = 1
+               AND g.active = '1'
                AND gm.grp__id = gg.id
-               AND gg.active = 1
+               AND gg.active = '1'
                AND g.id = m.grp__id
                AND m.id = mo.member__id
-               AND m.active = 1
+               AND m.active = '1'
                AND mo.object_id = ?
     }, undef);
     return row_aref($sel, ref $user ? $user->get_id : $user)->[0];

Modified: bricolage/trunk/lib/Bric/Util/UserPref.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/UserPref.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/lib/Bric/Util/UserPref.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -1123,7 +1123,7 @@
       . 'ON up.pref__id = o.pref__id AND up.value = o.value, '
       . 'member m, pref_member c';
     my $wheres = 'p.id = up.pref__id AND p.id = c.object_id '
-      . 'AND m.id = c.member__id AND m.active = 1';
+      . "AND m.id = c.member__id AND m.active = '1'";
     my @params;
     while (my ($k, $v) = each %$params) {
         if ($k eq 'id') {
@@ -1139,7 +1139,7 @@
             # Add in the group tables a second time and join to them.
             $tables .= ", member m2, pref_member c2";
             $wheres .= " AND p.id = c2.object_id AND c2.member__id = m2.id" .
-              " AND m2.active = 1 AND m2.grp__id = ?";
+              " AND m2.active = '1' AND m2.grp__id = ?";
             push @params, $v;
         } elsif ($k eq 'user_id') {
             $wheres .= ' AND up.usr__id = ?';

Modified: bricolage/trunk/sql/Pg/Bric/Biz/ATType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/ATType.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/ATType.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -27,39 +27,18 @@
 --
 
 CREATE TABLE at_type (
-    id              NUMERIC(10,0)  NOT NULL
+    id              INTEGER        NOT NULL
                                    DEFAULT NEXTVAL('seq_at_type'),
     name            VARCHAR(64)	   NOT NULL,
     description     VARCHAR(256),
-    top_level       NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_at_type__top_level
-                                     CHECK (top_level IN (0,1)),
-    paginated       NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_at_type__paginated
-                                     CHECK (paginated IN (0,1)),
-    fixed_url       NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_at_type__fixed_url
-                                     CHECK (fixed_url IN (0,1)),
-    related_story   NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_at_type__related_story
-                                     CHECK (related_story IN (0,1)),
-    related_media   NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_at_type__related_media
-                                     CHECK (related_media IN (0,1)),
-    media           NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_at_type__media
-                                     CHECK (media IN (0,1)),
-    biz_class__id   NUMERIC(10,0)  NOT NULL,
-    active          NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 1
-                                   CONSTRAINT ck_at_type__active
-                                     CHECK (active IN (0,1)),
+    top_level       BOOLEAN        NOT NULL DEFAULT FALSE,
+    paginated       BOOLEAN        NOT NULL DEFAULT FALSE,
+    fixed_url       BOOLEAN        NOT NULL DEFAULT FALSE,
+    related_story   BOOLEAN        NOT NULL DEFAULT FALSE,
+    related_media   BOOLEAN        NOT NULL DEFAULT FALSE,
+    media           BOOLEAN        NOT NULL DEFAULT FALSE,
+    biz_class__id   INTEGER        NOT NULL,
+    active          BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_at_type__id PRIMARY KEY (id)
 );
 
@@ -68,10 +47,10 @@
 --
 
 CREATE TABLE element_type_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_element_type_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER  NOT NULL
+                         DEFAULT NEXTVAL('seq_element_type_member'),
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_element_type_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/ATType.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/ATType.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/ATType.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,71 +11,71 @@
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (1, 'Stories', 'Story Types', 1, 0, 0, 10, 0, 0, 0, 1);
+VALUES ('1', 'Stories', 'Story Types', '1', '0', '0', '10', '0', '0', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (421, 28, 37, 1);
+VALUES ('421', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (1, 1, 421); 
+VALUES ('1', '1', '421'); 
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (2, 'Image', 'Images', 1, 0, 1, 50, 0, 0, 0, 1);
+VALUES ('2', 'Image', 'Images', '1', '0', '1', '50', '0', '0', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (422, 28, 37, 1);
+VALUES ('422', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (2, 2, 422); 
+VALUES ('2', '2', '422'); 
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (3, 'Insets', 'Inset Elements', 0, 0, 0, 10, 0, 0, 0, 1);
+VALUES ('3', 'Insets', 'Inset Elements', '0', '0', '0', '10', '0', '0', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (423, 28, 37, 1);
+VALUES ('423', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (3, 3, 423); 
+VALUES ('3', '3', '423'); 
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (4, 'Related Stories', 'Related Story Elements', 0, 0, 0, 10, 1, 0, 0, 1);
+VALUES ('4', 'Related Stories', 'Related Story Elements', '0', '0', '0', '10', '1', \
'0', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (424, 28, 37, 1);
+VALUES ('424', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (4, 4, 424); 
+VALUES ('4', '4', '424'); 
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (5, 'Pages', 'Page Elements', 0, 1, 0, 10, 0, 0, 0, 1);
+VALUES ('5', 'Pages', 'Page Elements', '0', '1', '0', '10', '0', '0', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (425, 28, 37, 1);
+VALUES ('425', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (5, 5, 425); 
+VALUES ('5', '5', '425'); 
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (6, 'Related Media', 'Related Media Elements', 0, 0, 0, 10, 0, 1, 0, 1);
+VALUES ('6', 'Related Media', 'Related Media Elements', '0', '0', '0', '10', '0', \
'1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (426, 28, 37, 1);
+VALUES ('426', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (6, 6, 426); 
+VALUES ('6', '6', '426'); 
 
 INSERT INTO at_type (id,name,description,top_level,paginated,media, biz_class__id,
                      related_story, related_media, fixed_url, active)
-VALUES (7, 'Covers', 'Cover Story Types', 1, 0, 0, 10, 0, 0, 1, 1);
+VALUES ('7', 'Covers', 'Cover Story Types', '1', '0', '0', '10', '0', '0', '1', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (427, 28, 37, 1);
+VALUES ('427', '28', '37', '1');
 
 INSERT INTO element_type_member (id, object_id, member__id)
-VALUES (7, 7, 427); 
+VALUES ('7', '7', '427'); 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -41,33 +41,27 @@
 --
 
 CREATE TABLE media (
-    id                NUMERIC(10,0)   NOT NULL
+    id                INTEGER   NOT NULL
                                       DEFAULT NEXTVAL('seq_media'),
-    element__id       NUMERIC(10,0)   NOT NULL,
-    priority          NUMERIC(1,0)    NOT NULL
+    element__id       INTEGER   NOT NULL,
+    priority          INT2      NOT NULL
                                       DEFAULT 3
                                       CONSTRAINT ck_media__priority
                                         CHECK (priority BETWEEN 1 AND 5),
-    source__id        NUMERIC(10,0)   NOT NULL,
-    current_version   NUMERIC(10,0),
-    published_version NUMERIC(10,0),
-    usr__id           NUMERIC(10,0),
+    source__id        INTEGER   NOT NULL,
+    current_version   INTEGER,
+    published_version INTEGER,
+    usr__id           INTEGER,
     first_publish_date TIMESTAMP,
     publish_date      TIMESTAMP,
     expire_date       TIMESTAMP,
     cover_date        TIMESTAMP,
-    workflow__id      NUMERIC(10,0)   NOT NULL,
-    desk__id          NUMERIC(10,0)   NOT NULL,
-    publish_status    NUMERIC(1,0)    NOT NULL
-                                      DEFAULT 0
-                                      CONSTRAINT ck_media__publish_status 
-                                        CHECK (publish_status IN (0,1)),
-    active            NUMERIC(1,0)    NOT NULL
-                                      DEFAULT 1
-                                      CONSTRAINT ck_media__active
-                                        CHECK (active IN (0,1)),
-    site__id          NUMERIC(10,0)   NOT NULL,
-    alias_id          NUMERIC(10,0)   CONSTRAINT ck_media_id
+    workflow__id      INTEGER   NOT NULL,
+    desk__id          INTEGER   NOT NULL,
+    publish_status    BOOLEAN    NOT NULL DEFAULT FALSE,
+    active            BOOLEAN    NOT NULL DEFAULT TRUE,
+    site__id          INTEGER   NOT NULL,
+    alias_id          INTEGER   CONSTRAINT ck_media_id
                                         CHECK (alias_id != id),  
     CONSTRAINT pk_media__id PRIMARY KEY (id)
 );
@@ -80,24 +74,21 @@
 --
 
 CREATE TABLE media_instance (
-    id                  NUMERIC(10,0)   NOT NULL
+    id                  INTEGER   NOT NULL
                                         DEFAULT NEXTVAL('seq_media_instance'),
     name                VARCHAR(256),
     description         VARCHAR(1024),
-    media__id           NUMERIC(10,0)   NOT NULL,
-    usr__id             NUMERIC(10,0)   NOT NULL,
-    version             NUMERIC(10,0),
-    category__id        NUMERIC(10,0)   NOT NULL,
-    media_type__id      NUMERIC(10,0)   NOT NULL,
-    primary_oc__id      NUMERIC(10,0)   NOT NULL,
-    file_size           NUMERIC(10,0),
+    media__id           INTEGER   NOT NULL,
+    usr__id             INTEGER   NOT NULL,
+    version             INTEGER,
+    category__id        INTEGER   NOT NULL,
+    media_type__id      INTEGER   NOT NULL,
+    primary_oc__id      INTEGER   NOT NULL,
+    file_size           INTEGER,
     file_name           VARCHAR(256),
     location            VARCHAR(256),
     uri                 VARCHAR(256),
-    checked_out         NUMERIC(1,0)    NOT NULL
-                                        DEFAULT 0
-                                        CONSTRAINT ck_media_instance__checked_out 
-                                        CHECK (checked_out IN(0,1)),
+    checked_out         BOOLEAN    NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_media_instance__id PRIMARY KEY (id)
 );
 
@@ -107,8 +98,8 @@
 -- Description: Tracks all URIs for stories.
 --
 CREATE TABLE media_uri (
-    media__id NUMERIC(10)     NOT NULL,
-    site__id  NUMERIC(10)     NOT NULL,
+    media__id INTEGER     NOT NULL,
+    site__id  INTEGER     NOT NULL,
     uri       TEXT            NOT NULL
 );
 
@@ -120,8 +111,8 @@
 --
 
 CREATE TABLE media__output_channel (
-    media_instance__id  NUMERIC(10, 0)  NOT NULL,
-    output_channel__id  NUMERIC(10, 0)  NOT NULL,
+    media_instance__id  INTEGER  NOT NULL,
+    output_channel__id  INTEGER  NOT NULL,
     CONSTRAINT pk_media_output_channel
       PRIMARY KEY (media_instance__id, output_channel__id)
 );
@@ -133,15 +124,12 @@
 --                              Will be run against uploaded files
 -- 
 CREATE TABLE media_fields (
-    id              NUMERIC(10,0)  NOT NULL     
+    id              INTEGER  NOT NULL     
                                    DEFAULT NEXTVAL('seq_media_fields'),
-    biz_pkg         NUMERIC(10,0)  NOT NULL,
+    biz_pkg         INTEGER  NOT NULL,
     name            VARCHAR(32)    NOT NULL,
     function_name   VARCHAR(256)   NOT NULL,
-    active          NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 1
-                                   CONSTRAINT ck_media_fields__active
-                                     CHECK (active IN(0,1)) ,
+    active          BOOLEAN   NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_media_fields__id PRIMARY KEY (id)
 );
 
@@ -153,11 +141,11 @@
 --
 
 CREATE TABLE media__contributor (
-    id                  NUMERIC(10,0)   NOT NULL
+    id                  INTEGER   NOT NULL
                                         DEFAULT NEXTVAL('seq_media__contributor'),
-    media_instance__id  NUMERIC(10,0)   NOT NULL,
-    member__id          NUMERIC(10,0)   NOT NULL,
-    place               NUMERIC(3,0)    NOT NULL,
+    media_instance__id  INTEGER   NOT NULL,
+    member__id          INTEGER   NOT NULL,
+    place               INT2      NOT NULL,
     role                VARCHAR(256),
     CONSTRAINT pk_media_category_id PRIMARY KEY (id)
 );
@@ -170,10 +158,10 @@
 --
 
 CREATE TABLE media_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER  NOT NULL
                                DEFAULT NEXTVAL('seq_media_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_media_member__id PRIMARY KEY (id)
 );
 
@@ -184,14 +172,12 @@
 --              its subsystem, its media ID and an attribute name.
 
 CREATE TABLE attr_media (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER   NOT NULL
                              DEFAULT NEXTVAL('seq_attr_media'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_media__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_media__id PRIMARY KEY (id)
 );
 
@@ -201,17 +187,15 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_media_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER     NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_media_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER     NOT NULL,
+    attr__id     INTEGER     NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_media_val__active CHECK (active \
IN (0,1)), +    serial       BOOLEAN      DEFAULT FALSE,
+    active       BOOLEAN      NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_media_val__id PRIMARY KEY (id)
 );
 
@@ -221,14 +205,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_media_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER     NOT NULL
                               DEFAULT NEXTVAL('seq_attr_media_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER     NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_media_meta__active CHECK (active IN \
(0,1)), +    active    BOOLEAN      NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_media_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.val	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Media.val	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -1,17 +1,17 @@
 -- Values for the media autopopulating fields
 
 INSERT INTO media_fields (id, biz_pkg, name, function_name, active)
-VALUES (0, 50, 'Width', 'get_width', 1);
+VALUES ('0', '50', 'Width', 'get_width', '1');
 
 INSERT INTO media_fields (id,  biz_pkg, name, function_name, active)
-VALUES (1, 50, 'Height', 'get_height', 1);
+VALUES ('1', '50', 'Height', 'get_height', '1');
 
 INSERT INTO media_fields (id, biz_pkg, name, function_name, active)
-VALUES (2, 50, 'Color Type', 'get_color_type', 1);
+VALUES ('2', '50', 'Color Type', 'get_color_type', '1');
 
 INSERT INTO media_fields (id, biz_pkg, name, function_name, active)
-VALUES (3, 50, 'Resolution', 'get_resolution', 1);
+VALUES ('3', '50', 'Resolution', 'get_resolution', '1');
 
 INSERT INTO media_fields (id, biz_pkg, name, function_name, active)
-VALUES (4, 50, 'Compression', 'get_compression', 1);
+VALUES ('4', '50', 'Compression', 'get_compression', '1');
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Container.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Container.sql	2004-11-09 \
                02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Container.sql	2004-11-09 \
03:32:57 UTC (rev 6066) @@ -25,23 +25,19 @@
 --
 
 CREATE TABLE story_container_tile (
-    id                   NUMERIC(10,0)   NOT NULL
+    id                   INTEGER         NOT NULL
                                          DEFAULT NEXTVAL('seq_container_tile'),
     name                 VARCHAR(64)     NOT NULL,
     key_name             VARCHAR(64)     NOT NULL,
     description          VARCHAR(256),
-    element__id          NUMERIC(10,0)   NOT NULL,
-    object_instance_id   NUMERIC(10,0)   NOT NULL,
-    parent_id            NUMERIC(10,0),
-    place                NUMERIC(10,0)   NOT NULL,
-    object_order         NUMERIC(10,0)   NOT NULL,
-    related_instance__id NUMERIC(10,0),
-    related_media__id    NUMERIC(10,0),
-    active               NUMERIC(1,0)    NOT NULL
-                                         DEFAULT 1
-                                         CONSTRAINT ck_sc_tile__active
-                                           CHECK (active IN (0,1)),
-
+    element__id          INTEGER         NOT NULL,
+    object_instance_id   INTEGER         NOT NULL,
+    parent_id            INTEGER,
+    place                INTEGER         NOT NULL,
+    object_order         INTEGER         NOT NULL,
+    related_instance__id INTEGER,
+    related_media__id    INTEGER,
+    active               BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_container_tile__id PRIMARY KEY (id)
 );
 
@@ -54,26 +50,22 @@
 --
 
 CREATE TABLE media_container_tile (
-    id                          NUMERIC(10,0)   NOT NULL
+    id                          INTEGER         NOT NULL
                                                 DEFAULT \
NEXTVAL('seq_media_container_tile'),  name                        VARCHAR(64)     NOT \
NULL,  key_name                    VARCHAR(64)     NOT NULL,
     description                 VARCHAR(256),
-    element__id      	        NUMERIC(10,0)   NOT NULL,
-    object_instance_id          NUMERIC(10,0)   NOT NULL,
-    parent_id                   NUMERIC(10,0),
-    place                       NUMERIC(10,0)   NOT NULL,
-    object_order                NUMERIC(10,0)   NOT NULL,
+    element__id      	        INTEGER         NOT NULL,
+    object_instance_id          INTEGER         NOT NULL,
+    parent_id                   INTEGER,
+    place                       INTEGER         NOT NULL,
+    object_order                INTEGER         NOT NULL,
 
     -- Hack. These two columns never hold values, but keep this table in sync
     -- with story_container_tile, since they share the same code base.
-    related_instance__id        NUMERIC(10,0), 
-    related_media__id           NUMERIC(10,0),
-    active              	NUMERIC(1,0)    NOT NULL
-                                                DEFAULT 1
-                                                CONSTRAINT ck_mc_tile__active
-                                                  CHECK (active IN (0,1)),
-
+    related_instance__id        INTEGER, 
+    related_media__id           INTEGER,
+    active              	    BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_media_container_tile__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Data.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Data.sql	2004-11-09 \
                02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Parts/Tile/Data.sql	2004-11-09 \
03:32:57 UTC (rev 6066) @@ -28,29 +28,21 @@
 --
 
 CREATE TABLE story_data_tile (
-    id                   NUMERIC(10,0)  NOT NULL
+    id                   INTEGER        NOT NULL
                                         DEFAULT NEXTVAL('seq_story_data_tile'),
     name                 VARCHAR(64)    NOT NULL,
     key_name             VARCHAR(64)    NOT NULL,
     description          VARCHAR(256),
-    element_data__id     NUMERIC(10,0)  NOT NULL,
-    object_instance_id   NUMERIC(10,0)  NOT NULL,
-    parent_id            NUMERIC(10,0)  NOT NULL,
-    hold_val             NUMERIC(1,0)   NOT NULL
-                                        DEFAULT 0
-                                        CONSTRAINT ck_sd_tile__hold_val
-                                          CHECK (hold_val IN (0,1)),
-
-    place                NUMERIC(10,0)  NOT NULL,
-    object_order         NUMERIC(10,0)  NOT NULL,
+    element_data__id     INTEGER        NOT NULL,
+    object_instance_id   INTEGER        NOT NULL,
+    parent_id            INTEGER        NOT NULL,
+    hold_val             BOOLEAN        NOT NULL DEFAULT FALSE,
+    place                INTEGER        NOT NULL,
+    object_order         INTEGER        NOT NULL,
     date_val             TIMESTAMP,
     short_val            TEXT,
     blob_val             TEXT,
-    active               NUMERIC(1,0)   NOT NULL
-                                        DEFAULT 1
-                                        CONSTRAINT ck_sd_tile__active
-                                          CHECK (active IN (0,1)),
-
+    active               BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_story_data_tile__id PRIMARY KEY (id)
 );
 
@@ -68,29 +60,21 @@
 --
 
 CREATE TABLE media_data_tile (
-    id                   NUMERIC(10,0)  NOT NULL
+    id                   INTEGER        NOT NULL
                                         DEFAULT NEXTVAL('seq_media_data_tile'),
     name                 VARCHAR(64)    NOT NULL,
     key_name             VARCHAR(64)    NOT NULL,
     description          VARCHAR(256),
-    element_data__id     NUMERIC(10,0)  NOT NULL,
-    object_instance_id   NUMERIC(10,0)  NOT NULL,
-    parent_id            NUMERIC(10,0)  NOT NULL,
-    place                NUMERIC(10,0)  NOT NULL,
-    hold_val             NUMERIC(1,0)   NOT NULL
-                                        DEFAULT 0
-                                        CONSTRAINT ck_md_tile__hold_val
-                                          CHECK (hold_val IN (0,1)),
-
-    object_order         NUMERIC(10,0)  NOT NULL,
+    element_data__id     INTEGER        NOT NULL,
+    object_instance_id   INTEGER        NOT NULL,
+    parent_id            INTEGER        NOT NULL,
+    place                INTEGER        NOT NULL,
+    hold_val             BOOLEAN        NOT NULL DEFAULT FALSE,
+    object_order         INTEGER        NOT NULL,
     date_val             TIMESTAMP,
     short_val            VARCHAR(1024),
     blob_val             TEXT,
-    active               NUMERIC(1,0)   NOT NULL
-                                        DEFAULT 1
-                                        CONSTRAINT ck_md_tile__active
-                                          CHECK (active IN (0,1)),
-
+    active               BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_media_data_tile__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Business/Story.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -44,34 +44,28 @@
 
 
 CREATE TABLE story (
-    id                NUMERIC(10,0)   NOT NULL
+    id                INTEGER         NOT NULL
                                       DEFAULT NEXTVAL('seq_story'),
-    priority          NUMERIC(1,0)    NOT NULL
+    priority          INT2            NOT NULL
                                       DEFAULT 3
                                       CONSTRAINT ck_story__priority
                                         CHECK (priority BETWEEN 1 AND 5),
-    source__id        NUMERIC(10,0)   NOT NULL, 
-    usr__id           NUMERIC(10,0),
-    element__id       NUMERIC(10,0)   NOT NULL,
+    source__id        INTEGER         NOT NULL, 
+    usr__id           INTEGER,
+    element__id       INTEGER         NOT NULL,
     primary_uri       VARCHAR(128),
     first_publish_date TIMESTAMP,
     publish_date      TIMESTAMP,
     expire_date       TIMESTAMP,
     cover_date        TIMESTAMP,
-    current_version   NUMERIC(10, 0)  NOT NULL,
-    published_version NUMERIC(10, 0),
-    workflow__id      NUMERIC(10,0)   NOT NULL,
-    desk__id          NUMERIC(10,0)   NOT NULL,
-    publish_status    NUMERIC(1,0)    NOT NULL
-                                      DEFAULT 0
-                                      CONSTRAINT ck_story__publish_status
-                                        CHECK (publish_status IN (0,1)),
-    active            NUMERIC(1,0)    NOT NULL
-                                      DEFAULT 1
-                                      CONSTRAINT ck_story__active
-                                        CHECK (active IN (0,1)),
-    site__id          NUMERIC(10,0)   NOT NULL,
-    alias_id          NUMERIC(10,0)   CONSTRAINT ck_story_id
+    current_version   INTEGER         NOT NULL,
+    published_version INTEGER,
+    workflow__id      INTEGER         NOT NULL,
+    desk__id          INTEGER         NOT NULL,
+    publish_status    BOOLEAN         NOT NULL DEFAULT FALSE,
+    active            BOOLEAN         NOT NULL DEFAULT TRUE,
+    site__id          INTEGER         NOT NULL,
+    alias_id          INTEGER         CONSTRAINT ck_story_id
                                         CHECK (alias_id != id),  
     CONSTRAINT pk_story__id PRIMARY KEY (id)
 );
@@ -84,19 +78,16 @@
 --
 
 CREATE TABLE story_instance (
-    id             NUMERIC(10,0)   NOT NULL
-                                  DEFAULT NEXTVAL('seq_story_instance'),
+    id             INTEGER      NOT NULL
+                                DEFAULT NEXTVAL('seq_story_instance'),
     name           VARCHAR(256),
     description    VARCHAR(1024),
-    story__id      NUMERIC(10,0)   NOT NULL,
-    version        NUMERIC(10,0),
-    usr__id        NUMERIC(10,0)   NOT NULL,
+    story__id      INTEGER      NOT NULL,
+    version        INTEGER,
+    usr__id        INTEGER      NOT NULL,
     slug           VARCHAR(64),
-    primary_oc__id NUMERIC(10,0)   NOT NULL,
-    checked_out    NUMERIC(1,0)    NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_story_instance__checked_out
-                                     CHECK (checked_out IN (0,1)),
+    primary_oc__id INTEGER      NOT NULL,
+    checked_out    BOOLEAN      NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_story_instance__id PRIMARY KEY (id)
 );
 
@@ -106,8 +97,8 @@
 -- Description: Tracks all URIs for stories.
 --
 CREATE TABLE story_uri (
-    story__id NUMERIC(10)     NOT NULL,
-    site__id NUMERIC(10)      NOT NULL,
+    story__id INTEGER     NOT NULL,
+    site__id INTEGER      NOT NULL,
     uri       TEXT            NOT NULL
 );
 
@@ -119,8 +110,8 @@
 --
 
 CREATE TABLE story__output_channel (
-    story_instance__id  NUMERIC(10, 0)  NOT NULL,
-    output_channel__id  NUMERIC(10, 0)  NOT NULL,
+    story_instance__id  INTEGER  NOT NULL,
+    output_channel__id  INTEGER  NOT NULL,
     CONSTRAINT pk_story_output_channel
       PRIMARY KEY (story_instance__id, output_channel__id)
 );
@@ -134,14 +125,11 @@
 --
 
 CREATE TABLE story__category (
-    id                  NUMERIC(10,0)  NOT NULL
+    id                  INTEGER  NOT NULL
                                        DEFAULT NEXTVAL('seq__story_category'),
-    story_instance__id  NUMERIC(10,0)  NOT NULL,
-    category__id        NUMERIC(10,0)  NOT NULL,
-    main                NUMERIC(1,0)   NOT NULL
-                                       DEFAULT 0
-                                       CONSTRAINT ck_story__category__main
-                                         CHECK (main IN (0,1)),
+    story_instance__id  INTEGER  NOT NULL,
+    category__id        INTEGER  NOT NULL,
+    main                BOOLEAN   NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_story_category__id PRIMARY KEY (id)
 );
 
@@ -153,11 +141,11 @@
 --
 
 CREATE TABLE story__contributor (
-    id                  NUMERIC(10,0)   NOT NULL
+    id                  INTEGER   NOT NULL
                                         DEFAULT NEXTVAL('seq_story__contributor'),
-    story_instance__id  NUMERIC(10,0)   NOT NULL,
-    member__id          NUMERIC(10,0)   NOT NULL,
-    place               NUMERIC(3,0)    NOT NULL,
+    story_instance__id  INTEGER   NOT NULL,
+    member__id          INTEGER   NOT NULL,
+    place               INT2      NOT NULL,
     role                VARCHAR(256),
     CONSTRAINT pk_story_category_id PRIMARY KEY (id)
 );
@@ -169,15 +157,12 @@
 --
 
 CREATE TABLE attr_story (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_story'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_story__active
-                               CHECK (active IN (0,1)),
+    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_story__id PRIMARY KEY (id)
 );
 
@@ -189,18 +174,15 @@
 --
 
 CREATE TABLE attr_story_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER     NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_story_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER     NOT NULL,
+    attr__id     INTEGER     NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_story_val__active
-                                   CHECK (active IN (0,1)),
+    serial       BOOLEAN      DEFAULT FALSE,
+    active       BOOLEAN      NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_story_val__id PRIMARY KEY (id)
 );
 
@@ -212,15 +194,12 @@
 --
 
 CREATE TABLE attr_story_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER     NOT NULL
                               DEFAULT NEXTVAL('seq_attr_story_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER     NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_story_meta__active
-                                CHECK (active IN (0,1)),
+    active    BOOLEAN      NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_story_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -38,38 +38,32 @@
 --
 --
 CREATE TABLE formatting (
-    id                  NUMERIC(10,0)  NOT NULL
+    id                  INTEGER        NOT NULL
                                        DEFAULT NEXTVAL('seq_formatting'),
     name                VARCHAR(256),
     description         VARCHAR(1024),
-    priority            NUMERIC(1,0)   NOT NULL
+    priority            INT2           NOT NULL
                                        DEFAULT 3
                                        CONSTRAINT ck_story__priority
                                          CHECK (priority BETWEEN 1 AND 5),
-    usr__id             NUMERIC(10,0),  
-    output_channel__id  NUMERIC(10,0)  NOT NULL,
-    tplate_type         NUMERIC(1,0)   NOT NULL
+    usr__id             INTEGER,  
+    output_channel__id  INTEGER        NOT NULL,
+    tplate_type         INT2           NOT NULL
                                        DEFAULT 1
                                        CONSTRAINT ck_formatting___tplate_type
                                          CHECK (tplate_type IN (1, 2, 3)),
-    element__id         NUMERIC(10,0),
-    category__id        NUMERIC(10,0),
+    element__id         INTEGER,
+    category__id        INTEGER,
     file_name           TEXT,
-    current_version     NUMERIC(10,0)  NOT NULL,
-    workflow__id        NUMERIC(10,0)  NOT NULL,
-    desk__id            NUMERIC(10,0)  NOT NULL,
-    published_version   NUMERIC(10, 0),
-    deploy_status       NUMERIC(1,0)   NOT NULL
-                                       DEFAULT 0
-                                       CONSTRAINT ck_formatting__deploy_status
-                                         CHECK (deploy_status IN (0,1)),
+    current_version     INTEGER        NOT NULL,
+    workflow__id        INTEGER        NOT NULL,
+    desk__id            INTEGER        NOT NULL,
+    published_version   INTEGER,
+    deploy_status       BOOLEAN        NOT NULL DEFAULT FALSE,
     deploy_date         TIMESTAMP,
     expire_date         TIMESTAMP,
-    active              NUMERIC(1,0)   NOT NULL
-                                       DEFAULT 1
-                                       CONSTRAINT ck_formatting__active
-                                         CHECK (active IN (0,1)),
-    site__id            NUMERIC(10,0)  NOT NULL,
+    active              BOOLEAN        NOT NULL DEFAULT TRUE,
+    site__id            INTEGER        NOT NULL,
     CONSTRAINT pk_formatting__id PRIMARY KEY (id)
 );
 
@@ -80,17 +74,14 @@
 --
 
 CREATE TABLE formatting_instance (
-    id              NUMERIC(10,0)  NOT NULL
+    id              INTEGER        NOT NULL
                                        DEFAULT NEXTVAL('seq_formatting_instance'),
-    formatting__id  NUMERIC(10,0)  NOT NULL,
-    version         NUMERIC(10,0),
-    usr__id         NUMERIC(10,0)  NOT NULL,
+    formatting__id  INTEGER        NOT NULL,
+    version         INTEGER,
+    usr__id         INTEGER        NOT NULL,
     file_name       TEXT,
     data            TEXT,
-    checked_out     NUMERIC(1,0)   NOT NULL     
-                                   DEFAULT 0
-                                   CONSTRAINT ck_formatting_instance__active
-                                     CHECK (checked_out IN (0,1)),
+    checked_out     BOOLEAN        NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_formatting_instance__id PRIMARY KEY (id)
 );
         
@@ -102,10 +93,10 @@
 --
 
 CREATE TABLE formatting_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_formatting_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_formatting_member__id PRIMARY KEY (id)
 );
 
@@ -116,14 +107,12 @@
 --              its subsystem, its formatting ID and an attribute name.
 
 CREATE TABLE attr_formatting (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_formatting'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_formatting__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_formatting__id PRIMARY KEY (id)
 );
 
@@ -134,17 +123,15 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_formatting_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_formatting_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_formatting_val__active CHECK \
(active IN (0,1)), +    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_formatting_val__id PRIMARY KEY (id)
 );
 
@@ -155,14 +142,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_formatting_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_attr_formatting_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_formatting_meta__active CHECK \
(active IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_formatting_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.val	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Asset/Formatting.val	2004-11-09 03:32:57 UTC (rev \
6066) @@ -1,6 +1,6 @@
 
 --
--- Data for TOC Entry ID 10 (OID 391692)
+-- Data for TOC Entry ID 10 (OID '391692')
 --
 -- Name: formatting Type: TABLE DATA Owner: castellan
 --
@@ -18,7 +18,7 @@
         '1', '1', '11',
         '1', '/book_profile.mc', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:21-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -29,7 +29,7 @@
         '1', '1', '3',
         '1', '/book_review.mc', '1', '0', '0',
         '1', '1','2001-07-30 13:34:22-07',NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -40,7 +40,7 @@
         '1', '1', '2',
         '1', '/column.mc', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:22-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -51,7 +51,7 @@
         '1', '1', '6',
         '1', '/inset.mc', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:23-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -62,7 +62,7 @@
        '1', '1', '10',
        '1', '/page.mc', '1', '0', '0',
        '1', '1', '2001-07-30 13:34:20-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -73,7 +73,7 @@
        '1', '1', '7',
        '1', '/pull_quote.mc', '1', '0', '0',
        '1', '1', '2001-07-30 13:34:20-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -84,7 +84,7 @@
         '1', '1', '8',
         '1', '/related_stories.mc', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:21-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -95,7 +95,7 @@
         '1', '1', '9',
         '1', '/related_story.mc', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:21-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -106,7 +106,7 @@
         '1', '1', '1',
         '1', '/story.mc', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:22-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -117,7 +117,7 @@
         '1', '2', NULL,
         '1', '/autohandler', '1', '0', '0',
         '1', '1', '2001-07-30 13:34:22-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -128,7 +128,7 @@
         '1', '1', '12',
         '1', '/related_media.mc', '1', '0', '0',
         '1', '1', '2001-08-01 14:51:34-07', NULL,
-        '1', 100);
+        '1', '100');
 
 INSERT INTO formatting (id, name, description, priority, usr__id,
                         output_channel__id, tplate_type, element__id,
@@ -139,10 +139,10 @@
         '1', '1', '13',
         '1', '/cover.mc', '1', '0', '0',
         '1', '1', '2001-08-01 14:51:34-07', NULL,
-        '1', 100);
+        '1', '100');
 
 --
--- Data for TOC Entry ID 5 (OID 391725)
+-- Data for TOC Entry ID 5 (OID '391725')
 --
 -- Name: formatting_instance Type: TABLE DATA Owner: castellan
 --
@@ -211,7 +211,7 @@
 
 
 --
--- Data for TOC Entry ID 5 (OID 387829)
+-- Data for TOC Entry ID 5 (OID '387829')
 --
 -- Name: member Type: TABLE DATA Owner: castellan
 --
@@ -234,7 +234,7 @@
 
 
 --
--- Data for TOC Entry ID 5 (OID 391761)
+-- Data for TOC Entry ID 5 (OID '391761')
 --
 -- Name: formatting_member Type: TABLE DATA Owner: castellan
 --
@@ -257,7 +257,7 @@
 
 
 --
--- Data for TOC Entry ID 6 (OID 391777)
+-- Data for TOC Entry ID 6 (OID '391777')
 --
 -- Name: attr_formatting Type: TABLE DATA Owner: castellan
 --
@@ -269,7 +269,7 @@
 
 
 --
--- Data for TOC Entry ID 6 (OID 391797)
+-- Data for TOC Entry ID 6 (OID '391797')
 --
 -- Name: attr_formatting_val Type: TABLE DATA Owner: castellan
 --

Modified: bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -40,31 +40,19 @@
 
 
 CREATE TABLE at_data (
-    id              NUMERIC(10,0)   NOT NULL
-                                    DEFAULT NEXTVAL('seq_element'),
-    element__id     NUMERIC(10,0)   NOT NULL,
-    key_name        VARCHAR(32),
-    description     VARCHAR(256),
-    place           NUMERIC(10,0)   NOT NULL,
-    required        NUMERIC(1,0)    NOT NULL
-                                    DEFAULT 0
-                                    CONSTRAINT ck_at_data__required
-                                      CHECK (required IN (0,1)),
-    quantifier      VARCHAR(2),
-    autopopulated   NUMERIC(1,0)    NOT NULL
-                                    DEFAULT 0
-                                      CONSTRAINT ck_at_data__autopopulated
-                                      CHECK (autopopulated IN (0,1)),
-    active          NUMERIC(1,0)    NOT NULL
-                                    DEFAULT 1
-                                    CONSTRAINT ck_at_data__active
-                                      CHECK (active IN (0,1)),
-    map_type__id     NUMERIC(10,0),
-    publishable      NUMERIC(1,0)   NOT NULL
-                                    DEFAULT 0
-                                    CONSTRAINT ck_at_data__publishable
-                                      CHECK (publishable IN (0,1)),
-    max_length       NUMERIC(10,0),
+    id               INTEGER         NOT NULL
+                                     DEFAULT NEXTVAL('seq_element'),
+    element__id      INTEGER         NOT NULL,
+    key_name         VARCHAR(32),
+    description      VARCHAR(256),
+    place            INTEGER         NOT NULL,
+    required         BOOLEAN         NOT NULL DEFAULT FALSE,
+    quantifier       VARCHAR(2),
+    autopopulated    BOOLEAN         NOT NULL DEFAULT FALSE,
+    active           BOOLEAN         NOT NULL DEFAULT TRUE,
+    map_type__id     INTEGER,
+    publishable      BOOLEAN         NOT NULL DEFAULT FALSE,
+    max_length       INTEGER,
     sql_type         VARCHAR(30),
     CONSTRAINT pk_at_data__id PRIMARY KEY (id)
 );
@@ -76,14 +64,12 @@
 --              its subsystem, its element_data ID and an attribute name.
 
 CREATE TABLE attr_at_data (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_at_data'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_at_data__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_at_data__id PRIMARY KEY (id)
 );
 
@@ -93,17 +79,15 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_at_data_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_at_data_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_at_data_val__active CHECK \
(active IN (0,1)), +    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_at_data_val__id PRIMARY KEY (id)
 );
 
@@ -113,14 +97,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_at_data_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_attr_at_data_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     TEXT,
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_at_data_meta__active CHECK (active \
IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_at_data_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.val	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/AssetType/Parts/Data.val	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -11,258 +11,258 @@
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (1, 10, 'paragraph', 'A Paragraph of text.', 1, 0, '1', 1, 1, 0, 'blob');
+VALUES ('1', '10', 'paragraph', 'A Paragraph of text.', '1', '0', '1', '1', '1', \
'0', 'blob');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (1, 'id_1', 'html_info', 'short', 1);
+VALUES ('1', 'id_1', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (1, 1, 1, 1);
+VALUES ('1', '1', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (1, 1, 'cols', '50', 1);
+VALUES ('1', '1', 'cols', '50', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (2, 1, 'maxlength', '', 1);
+VALUES ('2', '1', 'maxlength', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (3, 1, 'length', '', 1);
+VALUES ('3', '1', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (4, 1, 'vals', '', 1);
+VALUES ('4', '1', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (5, 1, 'multiple', '', 1);
+VALUES ('5', '1', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (6, 1, 'rows', '8', 1);
+VALUES ('6', '1', 'rows', '8', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (7, 1, 'value', '', 1);
+VALUES ('7', '1', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (8, 1, 'pos', '1', 1);
+VALUES ('8', '1', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (9, 1, 'disp', 'Paragraph', 1);
+VALUES ('9', '1', 'disp', 'Paragraph', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (10, 1, 'type', 'textarea', 1);
+VALUES ('10', '1', 'type', 'textarea', '1');
 
 
 -- Add a 'Previous' text field to page.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (2, 10, 'previous', 'Describes previous page.', 2, 0, '0', 1, 1, 256, \
'short'); +VALUES ('2', '10', 'previous', 'Describes previous page.', '2', '0', '0', \
'1', '1', '256', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (2, 'id_2', 'html_info', 'short', 1);
+VALUES ('2', 'id_2', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (2, 2, 2, 1);
+VALUES ('2', '2', '2', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (11, 2, 'cols', '', 1);
+VALUES ('11', '2', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (12, 2, 'maxlength', '256', 1);
+VALUES ('12', '2', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (13, 2, 'length', '32', 1);
+VALUES ('13', '2', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (14, 2, 'vals', '', 1);
+VALUES ('14', '2', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (15, 2, 'multiple', '', 1);
+VALUES ('15', '2', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (16, 2, 'rows', '', 1);
+VALUES ('16', '2', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (17, 2, 'value', '', 1);
+VALUES ('17', '2', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (18, 2, 'pos', '2', 1);
+VALUES ('18', '2', 'pos', '2', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (19, 2, 'disp', 'Previous', 1);
+VALUES ('19', '2', 'disp', 'Previous', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (20, 2, 'type', 'text', 1);
+VALUES ('20', '2', 'type', 'text', '1');
 
 
 -- Add a 'Next' text field to page.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (3, 10, 'next', 'Describes next page.', 3, 0, '0', 1, 1, 256, 'short');
+VALUES ('3', '10', 'next', 'Describes next page.', '3', '0', '0', '1', '1', '256', \
'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (3, 'id_3', 'html_info', 'short', 1);
+VALUES ('3', 'id_3', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (3, 3, 3, 1);
+VALUES ('3', '3', '3', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (21, 3, 'cols', '', 1);
+VALUES ('21', '3', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (22, 3, 'maxlength', '256', 1);
+VALUES ('22', '3', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (23, 3, 'length', '32', 1);
+VALUES ('23', '3', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (24, 3, 'vals', '', 1);
+VALUES ('24', '3', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (25, 3, 'multiple', '', 1);
+VALUES ('25', '3', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (26, 3, 'rows', '', 1);
+VALUES ('26', '3', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (27, 3, 'value', '', 1);
+VALUES ('27', '3', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (28, 3, 'pos', '3', 1);
+VALUES ('28', '3', 'pos', '3', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (29, 3, 'disp', 'Next', 1);
+VALUES ('29', '3', 'disp', 'Next', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (30, 3, 'type', 'text', 1);
+VALUES ('30', '3', 'type', 'text', '1');
 
 
 -- Create a 'Quote' textarea field for the 'Pull Quote' element.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (4, 7, 'quote', 'The pull quote quotation.', 1, 1, '0', 1, 1, 1024, 'short');
+VALUES ('4', '7', 'quote', 'The pull quote quotation.', '1', '1', '0', '1', '1', \
'1024', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (4, 'id_4', 'html_info', 'short', 1);
+VALUES ('4', 'id_4', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (4, 4, 4, 1);
+VALUES ('4', '4', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (31, 4, 'cols', '40', 1);
+VALUES ('31', '4', 'cols', '40', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (32, 4, 'maxlength', '1024', 1);
+VALUES ('32', '4', 'maxlength', '1024', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (33, 4, 'length', '', 1);
+VALUES ('33', '4', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (34, 4, 'vals', '', 1);
+VALUES ('34', '4', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (35, 4, 'multiple', '', 1);
+VALUES ('35', '4', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (36, 4, 'rows', '4', 1);
+VALUES ('36', '4', 'rows', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (37, 4, 'value', '', 1);
+VALUES ('37', '4', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (38, 4, 'pos', '1', 1);
+VALUES ('38', '4', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (39, 4, 'disp', 'Quote', 1);
+VALUES ('39', '4', 'disp', 'Quote', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (40, 4, 'type', 'textarea', 1);
+VALUES ('40', '4', 'type', 'textarea', '1');
 
 
 -- Create a 'Copy' textarea field for the 'Inset' element.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (5, 6, 'copy', 'The inset copy text.', 1, 1, '0', 1, 1, 1024, 'short');
+VALUES ('5', '6', 'copy', 'The inset copy text.', '1', '1', '0', '1', '1', '1024', \
'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (5, 'id_5', 'html_info', 'short', 1);
+VALUES ('5', 'id_5', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (5, 5, 5, 1);
+VALUES ('5', '5', '5', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (41, 5, 'cols', '50', 1);
+VALUES ('41', '5', 'cols', '50', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (42, 5, 'maxlength', '1024', 1);
+VALUES ('42', '5', 'maxlength', '1024', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (43, 5, 'length', '', 1);
+VALUES ('43', '5', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (44, 5, 'vals', '', 1);
+VALUES ('44', '5', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (45, 5, 'multiple', '', 1);
+VALUES ('45', '5', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (46, 5, 'rows', '8', 1);
+VALUES ('46', '5', 'rows', '8', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (47, 5, 'value', '', 1);
+VALUES ('47', '5', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (48, 5, 'pos', '1', 1);
+VALUES ('48', '5', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (49, 5, 'disp', 'Copy', 1);
+VALUES ('49', '5', 'disp', 'Copy', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (50, 5, 'type', 'textarea', 1);
+VALUES ('50', '5', 'type', 'textarea', '1');
 
 
 -- Add an 'Alternate Title' text field for the 'Related Story' element.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (6, 9, 'alternate_title', 'Alternate title to the story''s own', 1, 0, '0', \
1, 1, 256, 'short'); +VALUES ('6', '9', 'alternate_title', 'Alternate title to the \
story''s own', '1', '0', '0', '1', '1', '256', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (6, 'id_6', 'html_info', 'short', 1);
+VALUES ('6', 'id_6', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (6, 6, 6, 1);
+VALUES ('6', '6', '6', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (51, 6, 'cols', '', 1);
+VALUES ('51', '6', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (52, 6, 'maxlength', '256', 1);
+VALUES ('52', '6', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (53, 6, 'length', '32', 1);
+VALUES ('53', '6', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (54, 6, 'vals', '', 1);
+VALUES ('54', '6', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (55, 6, 'multiple', '', 1);
+VALUES ('55', '6', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (56, 6, 'rows', '', 1);
+VALUES ('56', '6', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (57, 6, 'value', '', 1);
+VALUES ('57', '6', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (58, 6, 'pos', '1', 1);
+VALUES ('58', '6', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (59, 6, 'disp', 'Alternate Title', 1);
+VALUES ('59', '6', 'disp', 'Alternate Title', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (60, 6, 'type', 'text', 1);
+VALUES ('60', '6', 'type', 'text', '1');
 
 
 
@@ -270,343 +270,343 @@
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (7, 9, 'alternate_teaser', 'Alternate teaser to the story''s own', 2, 0, '0', \
1, 1, 512, 'short'); +VALUES ('7', '9', 'alternate_teaser', 'Alternate teaser to the \
story''s own', '2', '0', '0', '1', '1', '512', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (7, 'id_7', 'html_info', 'short', 1);
+VALUES ('7', 'id_7', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (7, 7, 7, 1);
+VALUES ('7', '7', '7', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (61, 7, 'cols', '40', 1);
+VALUES ('61', '7', 'cols', '40', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (62, 7, 'maxlength', '512', 1);
+VALUES ('62', '7', 'maxlength', '512', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (63, 7, 'length', '', 1);
+VALUES ('63', '7', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (64, 7, 'vals', '', 1);
+VALUES ('64', '7', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (65, 7, 'multiple', '', 1);
+VALUES ('65', '7', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (66, 7, 'rows', '4', 1);
+VALUES ('66', '7', 'rows', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (67, 7, 'value', '', 1);
+VALUES ('67', '7', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (68, 7, 'pos', '2', 1);
+VALUES ('68', '7', 'pos', '2', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (69, 7, 'disp', 'Alternate Teaser', 1);
+VALUES ('69', '7', 'disp', 'Alternate Teaser', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (70, 7, 'type', 'textarea', 1);
+VALUES ('70', '7', 'type', 'textarea', '1');
 
 
 -- Add a 'Title' text field to the Book Profile.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (8, 11, 'title', 'The book''s title.', 1, 1, '0', 1, 1, 256, 'short');
+VALUES ('8', '11', 'title', 'The book''s title.', '1', '1', '0', '1', '1', '256', \
'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (8, 'id_8', 'html_info', 'short', 1);
+VALUES ('8', 'id_8', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (8, 8, 8, 1);
+VALUES ('8', '8', '8', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (71, 8, 'cols', '', 1);
+VALUES ('71', '8', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (72, 8, 'maxlength', '256', 1);
+VALUES ('72', '8', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (73, 8, 'length', '32', 1);
+VALUES ('73', '8', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (74, 8, 'vals', '', 1);
+VALUES ('74', '8', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (75, 8, 'multiple', '', 1);
+VALUES ('75', '8', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (76, 8, 'rows', '', 1);
+VALUES ('76', '8', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (77, 8, 'value', '', 1);
+VALUES ('77', '8', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (78, 8, 'pos', '1', 1);
+VALUES ('78', '8', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (79, 8, 'disp', 'Title', 1);
+VALUES ('79', '8', 'disp', 'Title', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (80, 8, 'type', 'text', 1);
+VALUES ('80', '8', 'type', 'text', '1');
 
 
 -- Add an 'Author' text field to the Book Profile.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (9, 11, 'author', 'The author''s name.', 2, 1, '0', 1, 1, 256, 'short');
+VALUES ('9', '11', 'author', 'The author''s name.', '2', '1', '0', '1', '1', '256', \
'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (9, 'id_9', 'html_info', 'short', 1);
+VALUES ('9', 'id_9', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (9, 9, 9, 1);
+VALUES ('9', '9', '9', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (81, 9, 'cols', '', 1);
+VALUES ('81', '9', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (82, 9, 'maxlength', '256', 1);
+VALUES ('82', '9', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (83, 9, 'length', '32', 1);
+VALUES ('83', '9', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (84, 9, 'vals', '', 1);
+VALUES ('84', '9', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (85, 9, 'multiple', '', 1);
+VALUES ('85', '9', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (86, 9, 'rows', '', 1);
+VALUES ('86', '9', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (87, 9, 'value', '', 1);
+VALUES ('87', '9', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (88, 9, 'pos', '2', 1);
+VALUES ('88', '9', 'pos', '2', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (89, 9, 'disp', 'Author', 1);
+VALUES ('89', '9', 'disp', 'Author', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (90, 9, 'type', 'text', 1);
+VALUES ('90', '9', 'type', 'text', '1');
 
 
 -- Add a 'Publisher' text field to the Book Profile.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (10, 11, 'publisher', 'The book''s publisher.', 3, 1, '0', 1, 1, 256, \
'short'); +VALUES ('10', '11', 'publisher', 'The book''s publisher.', '3', '1', '0', \
'1', '1', '256', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (10, 'id_10', 'html_info', 'short', 1);
+VALUES ('10', 'id_10', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (10, 10, 10, 1);
+VALUES ('10', '10', '10', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (91, 10, 'cols', '', 1);
+VALUES ('91', '10', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (92, 10, 'maxlength', '256', 1);
+VALUES ('92', '10', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (93, 10, 'length', '32', 1);
+VALUES ('93', '10', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (94, 10, 'vals', '', 1);
+VALUES ('94', '10', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (95, 10, 'multiple', '', 1);
+VALUES ('95', '10', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (96, 10, 'rows', '', 1);
+VALUES ('96', '10', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (97, 10, 'value', '', 1);
+VALUES ('97', '10', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (98, 10, 'pos', '3', 1);
+VALUES ('98', '10', 'pos', '3', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (99, 10, 'disp', 'Publisher', 1);
+VALUES ('99', '10', 'disp', 'Publisher', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (100, 10, 'type', 'text', 1);
+VALUES ('100', '10', 'type', 'text', '1');
 
 -- Add a 'Date' field to the Book Profile.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (11, 11, 'date', 'The date of publication.', 4, 1, '0', 1, 1, 0, 'date');
+VALUES ('11', '11', 'date', 'The date of publication.', '4', '1', '0', '1', '1', \
'0', 'date');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (11, 'id_11', 'html_info', 'short', 1);
+VALUES ('11', 'id_11', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (11, 11, 11, 1);
+VALUES ('11', '11', '11', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (101, 11, 'cols', '', 1);
+VALUES ('101', '11', 'cols', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (102, 11, 'maxlength', '', 1);
+VALUES ('102', '11', 'maxlength', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (103, 11, 'length', '', 1);
+VALUES ('103', '11', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (104, 11, 'vals', '', 1);
+VALUES ('104', '11', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (105, 11, 'multiple', '', 1);
+VALUES ('105', '11', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (106, 11, 'rows', '', 1);
+VALUES ('106', '11', 'rows', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (107, 11, 'value', '', 1);
+VALUES ('107', '11', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (108, 11, 'pos', '4', 1);
+VALUES ('108', '11', 'pos', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (109, 11, 'disp', 'Date', 1);
+VALUES ('109', '11', 'disp', 'Date', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (110, 11, 'type', 'date', 1);
+VALUES ('110', '11', 'type', 'date', '1');
 
 
 -- Add a 'Deck' field to Story.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (12, 1, 'deck', 'A one-sentence teaser or subhead.', 1, 1, '0', 1, 1, 256, \
'short'); +VALUES ('12', '1', 'deck', 'A one-sentence teaser or subhead.', '1', '1', \
'0', '1', '1', '256', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (12, 'id_12', 'html_info', 'short', 1);
+VALUES ('12', 'id_12', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (12, 12, 12, 1);
+VALUES ('12', '12', '12', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (111, 12, 'cols', '40', 1);
+VALUES ('111', '12', 'cols', '40', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (112, 12, 'maxlength', '256', 1);
+VALUES ('112', '12', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (113, 12, 'length', '', 1);
+VALUES ('113', '12', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (114, 12, 'vals', '', 1);
+VALUES ('114', '12', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (115, 12, 'multiple', '', 1);
+VALUES ('115', '12', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (116, 12, 'rows', '4', 1);
+VALUES ('116', '12', 'rows', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (117, 12, 'value', '', 1);
+VALUES ('117', '12', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (118, 12, 'pos', '1', 1);
+VALUES ('118', '12', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (119, 12, 'disp', 'Deck', 1);
+VALUES ('119', '12', 'disp', 'Deck', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (120, 12, 'type', 'textarea', 1);
+VALUES ('120', '12', 'type', 'textarea', '1');
 
 
 -- Add a 'Deck' field to Column.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (13, 2, 'deck', 'A one-sentence teaser or subhead.', 1, 1, '0', 1, 1, 256, \
'short'); +VALUES ('13', '2', 'deck', 'A one-sentence teaser or subhead.', '1', '1', \
'0', '1', '1', '256', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (13, 'id_13', 'html_info', 'short', 1);
+VALUES ('13', 'id_13', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (13, 13, 13, 1);
+VALUES ('13', '13', '13', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (121, 13, 'cols', '40', 1);
+VALUES ('121', '13', 'cols', '40', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (122, 13, 'maxlength', '256', 1);
+VALUES ('122', '13', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (123, 13, 'length', '', 1);
+VALUES ('123', '13', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (124, 13, 'vals', '', 1);
+VALUES ('124', '13', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (125, 13, 'multiple', '', 1);
+VALUES ('125', '13', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (126, 13, 'rows', '4', 1);
+VALUES ('126', '13', 'rows', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (127, 13, 'value', '', 1);
+VALUES ('127', '13', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (128, 13, 'pos', '1', 1);
+VALUES ('128', '13', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (129, 13, 'disp', 'Deck', 1);
+VALUES ('129', '13', 'disp', 'Deck', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (130, 13, 'type', 'textarea', 1);
+VALUES ('130', '13', 'type', 'textarea', '1');
 
 
 -- Add a 'Deck' field to Book Review.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (14, 3, 'deck', 'A one-sentence teaser or subhead.', 1, 1, '0', 1, 1, 256, \
'short'); +VALUES ('14', '3', 'deck', 'A one-sentence teaser or subhead.', '1', '1', \
'0', '1', '1', '256', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (14, 'id_14', 'html_info', 'short', 1);
+VALUES ('14', 'id_14', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (14, 14, 14, 1);
+VALUES ('14', '14', '14', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (131, 14, 'cols', '40', 1);
+VALUES ('131', '14', 'cols', '40', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (132, 14, 'maxlength', '256', 1);
+VALUES ('132', '14', 'maxlength', '256', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (133, 14, 'length', '', 1);
+VALUES ('133', '14', 'length', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (134, 14, 'vals', '', 1);
+VALUES ('134', '14', 'vals', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (135, 14, 'multiple', '', 1);
+VALUES ('135', '14', 'multiple', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (136, 14, 'rows', '4', 1);
+VALUES ('136', '14', 'rows', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (137, 14, 'value', '', 1);
+VALUES ('137', '14', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (138, 14, 'pos', '1', 1);
+VALUES ('138', '14', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (139, 14, 'disp', 'Deck', 1);
+VALUES ('139', '14', 'disp', 'Deck', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (140, 14, 'type', 'textarea', 1);
+VALUES ('140', '14', 'type', 'textarea', '1');
 
 
 
@@ -614,277 +614,277 @@
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (15, 4, 'height', 'Autopopulated Height field.', 1, 1, '0', 1, 0, 0, \
'short'); +VALUES ('15', '4', 'height', 'Autopopulated Height field.', '1', '1', '0', \
'1', '0', '0', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (15, 'id_15', 'html_info', 'short', 1);
+VALUES ('15', 'id_15', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (15, 15, 15, 1);
+VALUES ('15', '15', '15', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (141, 15, 'length', '32', 1);
+VALUES ('141', '15', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (142, 15, 'value', '', 1);
+VALUES ('142', '15', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (143, 15, 'pos', '1', 1);
+VALUES ('143', '15', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (144, 15, 'disp', 'Height', 1);
+VALUES ('144', '15', 'disp', 'Height', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (145, 15, 'type', 'text', 1);
+VALUES ('145', '15', 'type', 'text', '1');
 
 
 -- Add a 'Width' field to Photograph.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (16, 4, 'width', 'Autopopulated Width field.', 2, 1, '0', 1, 0, 0, 'short');
+VALUES ('16', '4', 'width', 'Autopopulated Width field.', '2', '1', '0', '1', '0', \
'0', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (16, 'id_16', 'html_info', 'short', 1);
+VALUES ('16', 'id_16', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (16, 16, 16, 1);
+VALUES ('16', '16', '16', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (146, 16, 'length', '32', 1);
+VALUES ('146', '16', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (147, 16, 'value', '', 1);
+VALUES ('147', '16', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (148, 16, 'pos', '2', 1);
+VALUES ('148', '16', 'pos', '2', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (149, 16, 'disp', 'Width', 1);
+VALUES ('149', '16', 'disp', 'Width', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (150, 16, 'type', 'text', 1);
+VALUES ('150', '16', 'type', 'text', '1');
 
 -- Add a 'Resolution' field to Photograph.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (17, 4, 'resolution', 'Autopopulated Resolution field.', 3, 1, '0', 1,
-        0, 0, 'short');
+VALUES ('17', '4', 'resolution', 'Autopopulated Resolution field.', '3', '1', '0', \
'1', +        '0', '0', 'short');
 
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (17, 'id_17', 'html_info', 'short', 1);
+VALUES ('17', 'id_17', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (17, 17, 17, 1);
+VALUES ('17', '17', '17', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (151, 17, 'length', '32', 1);
+VALUES ('151', '17', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (152, 17, 'value', '', 1);
+VALUES ('152', '17', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (153, 17, 'pos', '3', 1);
+VALUES ('153', '17', 'pos', '3', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (154, 17, 'disp', 'Resolution', 1);
+VALUES ('154', '17', 'disp', 'Resolution', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (155, 17, 'type', 'text', 1);
+VALUES ('155', '17', 'type', 'text', '1');
 
 -- Add a 'Compression' field to Photograph.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (18, 4, 'compression', 'Autopopulated Compression field.', 4, 1, '0',
-        1, 0, 0, 'short');
+VALUES ('18', '4', 'compression', 'Autopopulated Compression field.', '4', '1', '0',
+        '1', '0', '0', 'short');
 
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (18, 'id_18', 'html_info', 'short', 1);
+VALUES ('18', 'id_18', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (18, 18, 18, 1);
+VALUES ('18', '18', '18', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (156, 18, 'length', '32', 1);
+VALUES ('156', '18', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (157, 18, 'value', '', 1);
+VALUES ('157', '18', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (158, 18, 'pos', '4', 1);
+VALUES ('158', '18', 'pos', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (159, 18, 'disp', 'Compression', 1);
+VALUES ('159', '18', 'disp', 'Compression', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (160, 18, 'type', 'text', 1);
+VALUES ('160', '18', 'type', 'text', '1');
 
 -- Add a 'Color Type' field to Photograph.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (19, 4, 'color_type', 'Autopopulated Color Type field.', 5, 1, '0', 1,
-        0, 0, 'short');
+VALUES ('19', '4', 'color_type', 'Autopopulated Color Type field.', '5', '1', '0', \
'1', +        '0', '0', 'short');
 
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (19, 'id_19', 'html_info', 'short', 1);
+VALUES ('19', 'id_19', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (19, 19, 19, 1);
+VALUES ('19', '19', '19', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (161, 19, 'length', '32', 1);
+VALUES ('161', '19', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (162, 19, 'value', '', 1);
+VALUES ('162', '19', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (163, 19, 'pos', '5', 1);
+VALUES ('163', '19', 'pos', '5', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (164, 19, 'disp', 'Color Type', 1);
+VALUES ('164', '19', 'disp', 'Color Type', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (165, 19, 'type', 'text', 1);
+VALUES ('165', '19', 'type', 'text', '1');
 
 
 -- Add a 'Height' field to Illustration.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (20, 5, 'height', 'Autopopulated Height field.', 1, 1, '0', 1, 0, 0, \
'short'); +VALUES ('20', '5', 'height', 'Autopopulated Height field.', '1', '1', '0', \
'1', '0', '0', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (20, 'id_20', 'html_info', 'short', 1);
+VALUES ('20', 'id_20', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (20, 20, 20, 1);
+VALUES ('20', '20', '20', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (166, 20, 'length', '32', 1);
+VALUES ('166', '20', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (167, 20, 'value', '', 1);
+VALUES ('167', '20', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (168, 20, 'pos', '1', 1);
+VALUES ('168', '20', 'pos', '1', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (169, 20, 'disp', 'Height', 1);
+VALUES ('169', '20', 'disp', 'Height', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (170, 20, 'type', 'text', 1);
+VALUES ('170', '20', 'type', 'text', '1');
 
 
 -- Add a 'Width' field to Illustration.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (21, 5, 'width', 'Autopopulated Width field.', 2, 1, '0', 1, 0, 0, 'short');
+VALUES ('21', '5', 'width', 'Autopopulated Width field.', '2', '1', '0', '1', '0', \
'0', 'short');  
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (21, 'id_21', 'html_info', 'short', 1);
+VALUES ('21', 'id_21', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (21, 21, 21, 1);
+VALUES ('21', '21', '21', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (171, 21, 'length', '32', 1);
+VALUES ('171', '21', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (172, 21, 'value', '', 1);
+VALUES ('172', '21', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (173, 21, 'pos', '2', 1);
+VALUES ('173', '21', 'pos', '2', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (174, 21, 'disp', 'Width', 1);
+VALUES ('174', '21', 'disp', 'Width', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (175, 21, 'type', 'text', 1);
+VALUES ('175', '21', 'type', 'text', '1');
 
 -- Add a 'Resolution' field to Illustration.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (22, 5, 'resolution', 'Autopopulated Resolution field.', 3, 1, '0', 1,
-        0, 0, 'short');
+VALUES ('22', '5', 'resolution', 'Autopopulated Resolution field.', '3', '1', '0', \
'1', +        '0', '0', 'short');
 
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (22, 'id_22', 'html_info', 'short', 1);
+VALUES ('22', 'id_22', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (22, 22, 22, 1);
+VALUES ('22', '22', '22', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (176, 22, 'length', '32', 1);
+VALUES ('176', '22', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (177, 22, 'value', '', 1);
+VALUES ('177', '22', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (178, 22, 'pos', '3', 1);
+VALUES ('178', '22', 'pos', '3', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (179, 22, 'disp', 'Resolution', 1);
+VALUES ('179', '22', 'disp', 'Resolution', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (180, 22, 'type', 'text', 1);
+VALUES ('180', '22', 'type', 'text', '1');
 
 -- Add a 'Compression' field to Illustration.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (23, 5, 'compression', 'Autopopulated Compression field.', 4, 1, '0',
-        1, 0, 0, 'short');
+VALUES ('23', '5', 'compression', 'Autopopulated Compression field.', '4', '1', '0',
+        '1', '0', '0', 'short');
 
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (23, 'id_23', 'html_info', 'short', 1);
+VALUES ('23', 'id_23', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (23, 23, 23, 1);
+VALUES ('23', '23', '23', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (181, 23, 'length', '32', 1);
+VALUES ('181', '23', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (182, 23, 'value', '', 1);
+VALUES ('182', '23', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (183, 23, 'pos', '4', 1);
+VALUES ('183', '23', 'pos', '4', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (184, 23, 'disp', 'Compression', 1);
+VALUES ('184', '23', 'disp', 'Compression', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (185, 23, 'type', 'text', 1);
+VALUES ('185', '23', 'type', 'text', '1');
 
 -- Add a 'Color Type' field to Illustration.
 
 INSERT INTO at_data (id, element__id, key_name, description, place, required,
                      quantifier, active, publishable, max_length, sql_type)
-VALUES (24, 5, 'color_type', 'Autopopulated Color Type field.', 5, 1, '0', 1,
-        0, 0, 'short');
+VALUES ('24', '5', 'color_type', 'Autopopulated Color Type field.', '5', '1', '0', \
'1', +        '0', '0', 'short');
 
 INSERT INTO attr_at_data (id, subsys, name, sql_type, active)
-VALUES (24, 'id_24', 'html_info', 'short', 1);
+VALUES ('24', 'id_24', 'html_info', 'short', '1');
 
 INSERT INTO attr_at_data_val (id, object__id, attr__id, active)
-VALUES (24, 24, 24, 1);
+VALUES ('24', '24', '24', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (186, 24, 'length', '32', 1);
+VALUES ('186', '24', 'length', '32', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (187, 24, 'value', '', 1);
+VALUES ('187', '24', 'value', '', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (188, 24, 'pos', '5', 1);
+VALUES ('188', '24', 'pos', '5', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (189, 24, 'disp', 'Color Type', 1);
+VALUES ('189', '24', 'disp', 'Color Type', '1');
 
 INSERT INTO attr_at_data_meta (id, attr__id, name, value, active)
-VALUES (190, 24, 'type', 'text', 1);
+VALUES ('190', '24', 'type', 'text', '1');

Modified: bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/AssetType.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -44,22 +44,16 @@
 --
 
 CREATE TABLE element  (
-    id              NUMERIC(10,0)  NOT NULL
+    id              INTEGER        NOT NULL
                                    DEFAULT NEXTVAL('seq_element'),
     name            VARCHAR(64)    NOT NULL,
     key_name        VARCHAR(64)    NOT NULL,
     description     VARCHAR(256),
-    burner          NUMERIC(2,0)   NOT NULL DEFAULT 1,
-    reference       NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 0
-                                   CONSTRAINT ck_element__reference
-                                     CHECK (reference IN (0,1)),
-    type__id        NUMERIC(10,0)  NOT NULL,
-    at_grp__id      NUMERIC(10,0),
-    active          NUMERIC(1,0)   NOT NULL
-                                   DEFAULT 1
-                                   CONSTRAINT ck_element__active
-                                    CHECK (active IN (0,1)),
+    burner          INT2           NOT NULL DEFAULT 1,
+    reference       BOOLEAN        NOT NULL DEFAULT FALSE,
+    type__id        INTEGER        NOT NULL,
+    at_grp__id      INTEGER,
+    active          BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_element__id PRIMARY KEY (id)
 );
 
@@ -69,13 +63,10 @@
 -- Description: A table that maps 
 
 CREATE TABLE element__site (
-    element__id    NUMERIC(10)     NOT NULL,
-    site__id       NUMERIC(10)     NOT NULL,
-    active         NUMERIC(1)      DEFAULT 1
-                                   NOT NULL
-                                   CONSTRAINT ck_site_element__active
-                                     CHECK (active IN (0,1)),
-    primary_oc__id  NUMERIC(10,0) NOT NULL
+    element__id    INTEGER         NOT NULL,
+    site__id       INTEGER         NOT NULL,
+    active         BOOLEAN         NOT NULL DEFAULT TRUE,
+    primary_oc__id  INTEGER        NOT NULL
 );
 
 -- -----------------------------------------------------------------------------
@@ -86,18 +77,12 @@
 --
 
 CREATE TABLE element__output_channel (
-    id                  NUMERIC(10,0)  NOT NULL
-                                       DEFAULT \
                NEXTVAL('seq_element__output_channel'),
-    element__id         NUMERIC(10,0)  NOT NULL,
-    output_channel__id  NUMERIC(10,0)  NOT NULL,
-    enabled             NUMERIC(1,0)   NOT NULL
-                                       DEFAULT 1
-                                       CONSTRAINT ck_at__oc__enabled
-                                         CHECK (enabled IN (0,1)),
-    active              NUMERIC(1,0)   NOT NULL
-                                       DEFAULT 1
-                                       CONSTRAINT ck_at__oc__active
-                                         CHECK (active IN (0,1)),
+    id                  INTEGER    NOT NULL
+                                   DEFAULT NEXTVAL('seq_element__output_channel'),
+    element__id         INTEGER    NOT NULL,
+    output_channel__id  INTEGER    NOT NULL,
+    enabled             BOOLEAN    NOT NULL DEFAULT TRUE,
+    active              BOOLEAN    NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_at__oc__id PRIMARY KEY (id)
 );
 
@@ -111,14 +96,11 @@
 /*
 
 CREATE TABLE element__language (
-    id               NUMERIC(10)  NOT NULL
-                                  DEFAULT NEXTVAL('seq_element__language'),
-    element__id   NUMERIC(10)  NOT NULL,
-    language__id     NUMERIC(10)  NOT NULL,
-    active           NUMERIC(1)   NOT NULL
-                                  DEFAULT 1
-                                  CONSTRAINT ck_at__oc__active
-                                    CHECK (active IN (0,1)),
+    id               INTEGER  NOT NULL
+                              DEFAULT NEXTVAL('seq_element__language'),
+    element__id      INTEGER  NOT NULL,
+    language__id     INTEGER  NOT NULL,
+    active           BOOLEAN  NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_element__language__id PRIMARY KEY (id)
 );
 
@@ -131,10 +113,10 @@
 --
 
 CREATE TABLE element_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_element_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER  NOT NULL
+                         DEFAULT NEXTVAL('seq_element_member'),
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_element_member__id PRIMARY KEY (id)
 );
 
@@ -145,14 +127,12 @@
 --              its subsystem, its element ID and an attribute name.
 
 CREATE TABLE attr_element (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_element'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_element__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_element__id PRIMARY KEY (id)
 );
 
@@ -163,17 +143,15 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_element_val (
-    id           NUMERIC(10)     NOT NULL
-                                 DEFAULT NEXTVAL('seq_attr_element_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    id           INTEGER      NOT NULL
+                              DEFAULT NEXTVAL('seq_attr_element_val'),
+    object__id   INTEGER      NOT NULL,
+    attr__id     INTEGER      NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_element_val__active CHECK \
(active IN (0,1)), +    serial       BOOLEAN      DEFAULT FALSE,
+    active       BOOLEAN      NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_element_val__id PRIMARY KEY (id)
 );
 
@@ -183,14 +161,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_element_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_attr_element_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_element_meta__active CHECK (active \
IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_element_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/AssetType.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/AssetType.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/AssetType.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -9,306 +9,306 @@
 -- Create groups
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (330,24,'AssetType Group', 'Grouped containers');
+VALUES ('330','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (630, 35, 6, 1);
+VALUES ('630', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (630, 330, 630);
+VALUES ('630', '330', '630');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (331,24,'AssetType Group', 'Grouped containers');
+VALUES ('331','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (631, 35, 6, 1);
+VALUES ('631', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (631, 331, 631);
+VALUES ('631', '331', '631');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (332,24,'AssetType Group', 'Grouped containers');
+VALUES ('332','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (632, 35, 6, 1);
+VALUES ('632', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (632, 332, 632);
+VALUES ('632', '332', '632');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (333,24,'AssetType Group', 'Grouped containers');
+VALUES ('333','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (633, 35, 6, 1);
+VALUES ('633', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (633, 333, 633);
+VALUES ('633', '333', '633');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (334,24,'AssetType Group', 'Grouped containers');
+VALUES ('334','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (634, 35, 6, 1);
+VALUES ('634', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (634, 334, 634);
+VALUES ('634', '334', '634');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (335,24,'AssetType Group', 'Grouped containers');
+VALUES ('335','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (635, 35, 6, 1);
+VALUES ('635', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (635, 335, 635);
+VALUES ('635', '335', '635');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (340,24,'AssetType Group', 'Grouped containers');
+VALUES ('340','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (640, 35, 6, 1);
+VALUES ('640', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (640, 340, 640);
+VALUES ('640', '340', '640');
 
 INSERT INTO grp (id,class__id,name,description)
-VALUES (341,24,'AssetType Group', 'Grouped containers');
+VALUES ('341','24','AssetType Group', 'Grouped containers');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (641, 35, 6, 1);
+VALUES ('641', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (641, 341, 641);
+VALUES ('641', '341', '641');
 
 -- Create elements
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (1, 'Story', 'story', 'A story element', 1, 330, 1);
+VALUES ('1', 'Story', 'story', 'A story element', '1', '330', '1');
 
 INSERT INTO element__site (element__id, site__id, primary_oc__id)
-VALUES (1, 100, 1);
+VALUES ('1', '100', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (410, 27, 22, 1);
+VALUES ('410', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (11, 1, 410); 
+VALUES ('11', '1', '410'); 
 
 INSERT INTO element__output_channel (id, element__id, output_channel__id,
                                      enabled, active)
-VALUES (1, 1, 1, 1, 1);
+VALUES ('1', '1', '1', '1', '1');
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (2, 'Column', 'column', 'A weekly column element', 1, 331, 1);
+VALUES ('2', 'Column', 'column', 'A weekly column element', '1', '331', '1');
 
 INSERT INTO element__site (element__id, site__id, primary_oc__id)
-VALUES (2, 100, 1);
+VALUES ('2', '100', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (411, 27, 22, 1);
+VALUES ('411', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (12, 2, 411); 
+VALUES ('12', '2', '411'); 
 
 INSERT INTO element__output_channel (id, element__id, output_channel__id,
                                      enabled, active)
-VALUES (4, 2, 1, 1, 1);
+VALUES ('4', '2', '1', '1', '1');
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (3, 'Book Review', 'book_review', 'A book review element', 1, 332, 1);
+VALUES ('3', 'Book Review', 'book_review', 'A book review element', '1', '332', \
'1');  
 INSERT INTO element__site (element__id, site__id, primary_oc__id)
-VALUES (3, 100, 1);
+VALUES ('3', '100', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (412, 27, 22, 1);
+VALUES ('412', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (13, 3, 412); 
+VALUES ('13', '3', '412'); 
 
 INSERT INTO element__output_channel (id, element__id, output_channel__id,
                                      enabled, active)
-VALUES (7, 3, 1, 1, 1);
+VALUES ('7', '3', '1', '1', '1');
 
 
 -- Create some media asset types.
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (4, 'Photograph', 'photograph', 'A photograph element', 2, 333, 1);
+VALUES ('4', 'Photograph', 'photograph', 'A photograph element', '2', '333', '1');
 
 INSERT INTO element__site (element__id, site__id, primary_oc__id)
-VALUES (4, 100, 1);
+VALUES ('4', '100', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (413, 27, 22, 1);
+VALUES ('413', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (14, 4, 413); 
+VALUES ('14', '4', '413'); 
 
 INSERT INTO element__output_channel (id, element__id, output_channel__id,
                                      enabled, active)
-VALUES (10, 4, 1, 1, 1);
+VALUES ('10', '4', '1', '1', '1');
 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (5, 'Illustration', 'illustration', 'An illustration element', 2, 334, 1);
+VALUES ('5', 'Illustration', 'illustration', 'An illustration element', '2', '334', \
'1');  
 INSERT INTO element__site (element__id, site__id, primary_oc__id)
-VALUES (5, 100, 1);
+VALUES ('5', '100', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (414, 27, 22, 1);
+VALUES ('414', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (15, 5, 414); 
+VALUES ('15', '5', '414'); 
 
 INSERT INTO element__output_channel (id, element__id, output_channel__id,
                                      enabled, active)
-VALUES (13, 5, 1, 1, 1);
+VALUES ('13', '5', '1', '1', '1');
 
 
 -- Create some sub-elements.
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (6, 'Inset', 'inset', 'An inset element', 3, NULL, 1);
+VALUES ('6', 'Inset', 'inset', 'An inset element', '3', NULL, '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (415, 27, 22, 1);
+VALUES ('415', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (16, 6, 415); 
+VALUES ('16', '6', '415'); 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (7, 'Pull Quote', 'pull_quote', 'A pull quote element', 3, NULL, 1);
+VALUES ('7', 'Pull Quote', 'pull_quote', 'A pull quote element', '3', NULL, '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (416, 27, 22, 1);
+VALUES ('416', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (17, 7, 416); 
+VALUES ('17', '7', '416'); 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (8, 'Related Stories', 'related_stories', 'A related stories element.', 3, \
341, 1); +VALUES ('8', 'Related Stories', 'related_stories', 'A related stories \
element.', '3', '341', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (417, 27, 22, 1);
+VALUES ('417', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (18, 8, 417); 
+VALUES ('18', '8', '417'); 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (9, 'Related Story', 'related_story', 'A related story element.', 4, NULL, \
1); +VALUES ('9', 'Related Story', 'related_story', 'A related story element.', '4', \
NULL, '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (418, 27, 22, 1);
+VALUES ('418', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (19, 9, 418); 
+VALUES ('19', '9', '418'); 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (10, 'Page', 'page',  'A page element.', 5, 340, 1);
+VALUES ('10', 'Page', 'page',  'A page element.', '5', '340', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (419, 27, 22, 1);
+VALUES ('419', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (20, 10, 419); 
+VALUES ('20', '10', '419'); 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (11, 'Book Profile', 'book_profile', 'A book profile inset element.', 3, \
NULL, 1); +VALUES ('11', 'Book Profile', 'book_profile', 'A book profile inset \
element.', '3', NULL, '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (420, 27, 22, 1);
+VALUES ('420', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (21, 11, 420); 
+VALUES ('21', '11', '420'); 
 
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (12, 'Related Media', 'related_media', 'A related media element.', 6, NULL, \
1); +VALUES ('12', 'Related Media', 'related_media', 'A related media element.', '6', \
NULL, '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (437, 27, 22, 1);
+VALUES ('437', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (22, 12, 437); 
+VALUES ('22', '12', '437'); 
 
 
 -- A Cover Element
 INSERT INTO element (id, name, key_name, description, type__id, at_grp__id, active)
-VALUES (13, 'Cover', 'cover', 'A cover element.', 7, 335, 1);
+VALUES ('13', 'Cover', 'cover', 'A cover element.', '7', '335', '1');
 
 INSERT INTO element__site (element__id, site__id, primary_oc__id)
-VALUES (13, 100, 1);
+VALUES ('13', '100', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (438, 27, 22, 1);
+VALUES ('438', '27', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id)
-VALUES (23, 13, 438); 
+VALUES ('23', '13', '438'); 
 
 INSERT INTO element__output_channel (id, element__id, output_channel__id,
                                      enabled, active)
-VALUES (14, 13, 1, 1, 1);
+VALUES ('14', '13', '1', '1', '1');
 
 -- Create members
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (301, 330, 22, 1);
+VALUES ('301', '330', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (1, 10, 301);
+VALUES ('1', '10', '301');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (302, 331, 22, 1);
+VALUES ('302', '331', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (2, 10, 302);
+VALUES ('2', '10', '302');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (303, 332, 22, 1);
+VALUES ('303', '332', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (3, 10, 303);
+VALUES ('3', '10', '303');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (305, 340, 22, 1);
+VALUES ('305', '340', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (5, 7, 305);
+VALUES ('5', '7', '305');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (306, 340, 22, 1);
+VALUES ('306', '340', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (6, 6, 306);
+VALUES ('6', '6', '306');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (307, 330, 22, 1);
+VALUES ('307', '330', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (7, 7, 307);
+VALUES ('7', '7', '307');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (308, 341, 22, 1);
+VALUES ('308', '341', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (8, 9, 308);
+VALUES ('8', '9', '308');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (309, 332, 22, 1);
+VALUES ('309', '332', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (9, 11, 309);
+VALUES ('9', '11', '309');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (310, 335, 22, 1);
+VALUES ('310', '335', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (10, 8, 310);
+VALUES ('10', '8', '310');
 
 INSERT INTO member (id, grp__id, class__id, active) 
-VALUES (311, 335, 22, 1);
+VALUES ('311', '335', '22', '1');
 
 INSERT INTO element_member (id, object_id, member__id) 
-VALUES (24, 12, 311);
+VALUES ('24', '12', '311');
 
 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Category.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Category.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Category.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -38,19 +38,16 @@
 --
 
 CREATE TABLE category (
-    id               NUMERIC(10,0)   NOT NULL
+    id               INTEGER         NOT NULL
                                      DEFAULT NEXTVAL('seq_category'),
-    site__id         NUMERIC(10,0)   NOT NULL,
+    site__id         INTEGER         NOT NULL,
     directory        VARCHAR(128)    NOT NULL,
     uri              VARCHAR(256)    NOT NULL,
     name             VARCHAR(64),
     description      VARCHAR(256),
-    parent_id        NUMERIC(10,0)   NOT NULL,
-    asset_grp_id     NUMERIC(10,0)   NOT NULL,
-    active           NUMERIC(1,0)    NOT NULL
-                                     DEFAULT 1
-                                     CONSTRAINT ck_category__active
-                                       CHECK (active IN (0,1)),
+    parent_id        INTEGER         NOT NULL,
+    asset_grp_id     INTEGER         NOT NULL,
+    active           BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_category__id PRIMARY KEY (id)
 );
 
@@ -62,10 +59,10 @@
 --
 
 CREATE TABLE category_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_category_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER  NOT NULL
+                         DEFAULT NEXTVAL('seq_category_member'),
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_category_member__id PRIMARY KEY (id)
 );
 
@@ -76,14 +73,12 @@
 --              its subsystem, its category ID and an attribute name.
 
 CREATE TABLE attr_category (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_category'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_category__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_category__id PRIMARY KEY (id)
 );
 
@@ -95,17 +90,15 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_category_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_category_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_category_val__active CHECK \
(active IN (0,1)), +    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_category_val__id PRIMARY KEY (id)
 );
 
@@ -116,14 +109,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_category_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_attr_category_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_category_meta__active CHECK (active \
IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_category_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Category.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Category.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Category.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,26 +11,26 @@
 
 INSERT INTO category (id,site__id,directory, uri, parent_id, name, description,
                       asset_grp_id) 
-VALUES (0, 100,'', '', 0, 'Master Root Category', 'Master Root Category', 68);
+VALUES ('0', '100','', '', '0', 'Master Root Category', 'Master Root Category', \
'68');  
 -- Put it into the All Categories group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (58, 26, 20, 1);
+VALUES ('58', '26', '20', '1');
 
 INSERT INTO category_member (id, object_id, member__id)
-VALUES (1, 0, 58); 
+VALUES ('1', '0', '58'); 
 
 -- -----------------------------------------------------------------------------
 -- This is the default category for the default site
 
 INSERT INTO category (id,site__id,directory, uri, parent_id, name, description,
                       asset_grp_id) 
-VALUES (1, 100,'', '/', 0, 'Default Site Root Category',
-        'Default Site root category', 68);
+VALUES ('1', '100','', '/', '0', 'Default Site Root Category',
+        'Default Site root category', '68');
 
 -- Put it into the All Categories group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (61, 26, 20, 1);
+VALUES ('61', '26', '20', '1');
 
 INSERT INTO category_member (id, object_id, member__id)
-VALUES (2, 1, 61); 
+VALUES ('2', '1', '61'); 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Contact.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Contact.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Contact.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -13,18 +13,12 @@
 --
 
 CREATE TABLE contact (
-    id           NUMERIC(10, 0)    NOT NULL
+    id           INTEGER           NOT NULL
                                    DEFAULT NEXTVAL('seq_contact'),
     type         VARCHAR(64)       NOT NULL,
     description	 VARCHAR(256),
-    active       NUMERIC(1, 0)     NOT NULL 
-                                   DEFAULT 1
-                                   CONSTRAINT ck_contact__active
-                                     CHECK (active IN (1,0)),
-    alertable    NUMERIC(1, 0)     NOT NULL 
-                                   DEFAULT 0
-                                   CONSTRAINT ck_contact__alertable
-                                     CHECK (alertable IN (1,0)),
+    active       BOOLEAN           NOT NULL DEFAULT TRUE,
+    alertable    BOOLEAN           NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_contact__id PRIMARY KEY (id)
 );
 
@@ -33,14 +27,11 @@
 --
 
 CREATE TABLE contact_value (
-    id           NUMERIC(10, 0)    NOT NULL
+    id           INTEGER           NOT NULL
                                    DEFAULT NEXTVAL('seq_contact_value'),
-    contact__id  NUMERIC(10, 0)    NOT NULL,
-    value	 VARCHAR(256)	   NOT NULL,
-    active       NUMERIC(1, 0)     NOT NULL 
-                                   DEFAULT 1
-                                   CONSTRAINT ck_contact_value__active
-                                     CHECK (active IN (1,0)),
+    contact__id  INTEGER           NOT NULL,
+    value	     VARCHAR(256)	   NOT NULL,
+    active       BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_contact_value__id PRIMARY KEY (id)
 );
 
@@ -48,8 +39,8 @@
 -- TABLE: person__contact
 --
 CREATE TABLE person__contact_value (
-    person__id   NUMERIC(10, 0) NOT NULL,
-    contact_value__id  NUMERIC(10, 0) NOT NULL,
+    person__id          INTEGER    NOT NULL,
+    contact_value__id   INTEGER    NOT NULL,
     CONSTRAINT pk_person__contact_value PRIMARY KEY (person__id, contact_value__id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Contact.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Contact.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Contact.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -6,45 +6,45 @@
 -- Author: David Wheeler <david@wheeler.net>
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (1, 'Primary Email', 'Primary Electronic Mail Address', 1, 1);
+VALUES ('1', 'Primary Email', 'Primary Electronic Mail Address', '1', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (2, 'Secondary Email', 'Secondary Electronic Mail Address', 1, 1);
+VALUES ('2', 'Secondary Email', 'Secondary Electronic Mail Address', '1', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (3, 'Business Phone', 'Business Phone Number', 0, 1);
+VALUES ('3', 'Business Phone', 'Business Phone Number', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (4, 'Home Phone', 'Home Phone Number', 0, 1);
+VALUES ('4', 'Home Phone', 'Home Phone Number', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (5, 'Fax', 'Fax Number', 0, 1);
+VALUES ('5', 'Fax', 'Fax Number', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (6, 'Mobile Phone', 'Mobile Phone Number', 0, 1);
+VALUES ('6', 'Mobile Phone', 'Mobile Phone Number', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (7, 'Pager', 'Pager Number', 0, 1);
+VALUES ('7', 'Pager', 'Pager Number', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (8, 'Pager Email', 'Email Address for Pager', 1, 1);
+VALUES ('8', 'Pager Email', 'Email Address for Pager', '1', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (9, 'AIM ID', 'AOL Instant Messenger ID', 0, 1);
+VALUES ('9', 'AIM ID', 'AOL Instant Messenger ID', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (10, 'ICQ ID', 'ICQ Messenger ID', 0, 1);
+VALUES ('10', 'ICQ ID', 'ICQ Messenger ID', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (11, 'MSN ID', 'Microsoft Messenger ID', 0, 1);
+VALUES ('11', 'MSN ID', 'Microsoft Messenger ID', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (12, 'Yahoo! Pager ID', 'Yahoo! Pager Messenger ID', 0, 1);
+VALUES ('12', 'Yahoo! Pager ID', 'Yahoo! Pager Messenger ID', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (13, 'Jabber ID', 'Jabber Messenger ID', 0, 1);
+VALUES ('13', 'Jabber ID', 'Jabber Messenger ID', '0', '1');
 
 INSERT INTO contact (id, type, description, alertable, active)
-VALUES (14, 'WWW', 'WWW URL', 0, 1);
+VALUES ('14', 'WWW', 'WWW URL', '0', '1');
 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Keyword.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Keyword.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Keyword.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -22,15 +22,12 @@
 -- Description: The main keyword table.
 
 CREATE TABLE keyword (
-    id               NUMERIC(10)   NOT NULL
+    id               INTEGER       NOT NULL
                                    DEFAULT NEXTVAL('seq_keyword'),
     name             VARCHAR(256)  NOT NULL,
     screen_name      VARCHAR(256)  NOT NULL,
     sort_name        VARCHAR(256)  NOT NULL,
-    active           NUMERIC(1)	   NOT NULL
-                                   DEFAULT 1
-                                   CONSTRAINT ck_keyword__active
-                                     CHECK (active IN (0,1)),
+    active           BOOLEAN	   NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_keyword__id PRIMARY KEY (id)
 );
 
@@ -41,8 +38,8 @@
 --
 
 CREATE TABLE story_keyword (
-    story_id          NUMERIC(10,0)  NOT NULL,
-    keyword_id        NUMERIC(10,0)  NOT NULL,
+    story_id          INTEGER  NOT NULL,
+    keyword_id        INTEGER  NOT NULL,
     PRIMARY KEY (story_id, keyword_id)
 );
 
@@ -54,8 +51,8 @@
 --
 
 CREATE TABLE media_keyword (
-    media_id         NUMERIC(10,0)  NOT NULL,
-    keyword_id       NUMERIC(10,0)  NOT NULL,
+    media_id         INTEGER  NOT NULL,
+    keyword_id       INTEGER  NOT NULL,
     PRIMARY KEY (media_id, keyword_id)
 );
 
@@ -66,8 +63,8 @@
 --
 
 CREATE TABLE category_keyword (
-    category_id       NUMERIC(10,0)  NOT NULL,
-    keyword_id        NUMERIC(10,0)  NOT NULL,
+    category_id       INTEGER  NOT NULL,
+    keyword_id        INTEGER  NOT NULL,
     PRIMARY KEY (category_id, keyword_id)
 );
 
@@ -76,10 +73,10 @@
 --
 
 CREATE TABLE keyword_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_keyword_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER  NOT NULL
+                         DEFAULT NEXTVAL('seq_keyword_member'),
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_keyword_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -13,14 +13,11 @@
 --
 
 CREATE TABLE addr (
-    id         NUMERIC(10, 0)      NOT NULL
+    id         INTEGER             NOT NULL
                                    DEFAULT NEXTVAL('seq_addr'),
-    org__id    NUMERIC(10, 0)      NOT NULL,
+    org__id    INTEGER             NOT NULL,
     type       VARCHAR(64),
-    active     NUMERIC(1, 0)       NOT NULL 
-                                   DEFAULT 1
-                                   CONSTRAINT ck_addr__active
-                                     CHECK (active IN (1,0)),
+    active     BOOLEAN             NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_addr__id PRIMARY KEY (id)
 );
 
@@ -30,13 +27,10 @@
 --
 
 CREATE TABLE addr_part_type (
-    id         NUMERIC(10, 0)      NOT NULL
+    id         INTEGER             NOT NULL
                                    DEFAULT NEXTVAL('seq_addr_part_type'),
     name      VARCHAR(64)          NOT NULL,
-    active     NUMERIC(1, 0)       NOT NULL 
-                                   DEFAULT 1
-                                   CONSTRAINT ck_addr_part_type__active
-                                     CHECK (active IN (1,0)),
+    active     BOOLEAN             NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_addr_part_type__id PRIMARY KEY (id)
 );
 
@@ -46,10 +40,10 @@
 --
 
 CREATE TABLE addr_part (
-    id                    NUMERIC(10, 0)  NOT NULL
-                                                 DEFAULT NEXTVAL('seq_addr_part'),
-    addr__id              NUMERIC(10, 0)  NOT NULL,
-    addr_part_type__id    NUMERIC(10, 0)  NOT NULL,
+    id                    INTEGER         NOT NULL
+                                          DEFAULT NEXTVAL('seq_addr_part'),
+    addr__id              INTEGER         NOT NULL,
+    addr_part_type__id    INTEGER         NOT NULL,
     value                 VARCHAR(256)    NOT NULL,
     CONSTRAINT pk_addr_part__id PRIMARY KEY (id)
 );
@@ -59,8 +53,8 @@
 --
 
 CREATE TABLE person_org__addr(
-    addr__id          NUMERIC(10, 0)    NOT NULL,
-    person_org__id    NUMERIC(10, 0)    NOT NULL,
+    addr__id          INTEGER           NOT NULL,
+    person_org__id    INTEGER           NOT NULL,
     CONSTRAINT pk_person_org__addr__all PRIMARY KEY (addr__id,person_org__id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.val	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org/Parts/Addr.val	2004-11-09 03:32:57 UTC (rev \
6066) @@ -10,16 +10,16 @@
 DELETE FROM addr_part_type;
 
 INSERT INTO addr_part_type (id, name, active)
-VALUES (1, 'Line', 1);
+VALUES ('1', 'Line', '1');
 
 INSERT INTO addr_part_type (id, name, active)
-VALUES (2, 'City', 1);
+VALUES ('2', 'City', '1');
 
 INSERT INTO addr_part_type (id, name, active)
-VALUES (3, 'State', 1);
+VALUES ('3', 'State', '1');
 
 INSERT INTO addr_part_type (id, name, active)
-VALUES (4, 'Code', 1);
+VALUES ('4', 'Code', '1');
 
 INSERT INTO addr_part_type (id, name, active)
-VALUES (5, 'Country', 1);
+VALUES ('5', 'Country', '1');

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org/Person.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org/Person.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org/Person.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,16 +11,14 @@
 -- TABLE: person_org 
 --
 CREATE TABLE person_org(
-    id            NUMERIC(10, 0)    NOT NULL
+    id            INTEGER           NOT NULL
                                     DEFAULT NEXTVAL('seq_person_org'),
-    person__id    NUMERIC(10, 0)    NOT NULL,
-    org__id       NUMERIC(10, 0)    NOT NULL,
+    person__id    INTEGER           NOT NULL,
+    org__id       INTEGER           NOT NULL,
     role          VARCHAR(64),
     department    VARCHAR(64),
     title         VARCHAR(64),
-    active        NUMERIC(1, 0)    NOT NULL 
-                                   CONSTRAINT ck_person_org__active CHECK (active IN \
                (1,0))
-                                   DEFAULT 1,
+    active        BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_person_org__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -20,15 +20,13 @@
 --
 
 CREATE TABLE source (
-    id            NUMERIC(10, 0)    NOT NULL
+    id            INTEGER           NOT NULL
                                     DEFAULT NEXTVAL('seq_source'),
-    org__id       NUMERIC(10, 0)    NOT NULL,
+    org__id       INTEGER           NOT NULL,
     name          VARCHAR(64)       NOT NULL,
     description   VARCHAR(256),
-    expire        NUMERIC(4, 0)     NOT NULL
-				    DEFAULT 0,
-    active        NUMERIC(1, 0)     CONSTRAINT ck_source__active CHECK (active IN \
                (1,0))
-                                    DEFAULT 1,
+    expire        SMALLINT          NOT NULL DEFAULT 0,
+    active        BOOLEAN           DEFAULT TRUE,
     CONSTRAINT pk_source__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org/Source.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -6,11 +6,11 @@
 -- Author: David Wheeler <david@wheeler.net>
 
 INSERT INTO source (id, org__id, name, description, expire, active)
-VALUES (1, 1, 'Internal', 'Ourselves.', 0, 1);
+VALUES ('1', '1', 'Internal', 'Ourselves.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (429, 5, 35, 1);
+VALUES ('429', '5', '35', '1');
 
 INSERT INTO source_member (id, object_id, member__id)
-VALUES (1, 1, 429); 
+VALUES ('1', '1', '429'); 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -12,18 +12,12 @@
 -- TABLE: org 
 --
 CREATE TABLE org (
-    id           NUMERIC(10, 0)    NOT NULL
+    id           INTEGER           NOT NULL
                                    DEFAULT NEXTVAL('seq_org'),
     name         VARCHAR(64)       NOT NULL,
     long_name    VARCHAR(128),
-    personal     NUMERIC(1, 0)     NOT NULL 
-                                   DEFAULT 0
-                                   CONSTRAINT ck_org__personal
-                                     CHECK (personal IN (1,0)),
-    active       NUMERIC(1, 0)     NOT NULL 
-                                   DEFAULT 1
-                                   CONSTRAINT ck_org__active
-                                     CHECK (active IN (1,0)),
+    personal     BOOLEAN           NOT NULL DEFAULT FALSE,
+    active       BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_org__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Org.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Org.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Org.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -7,10 +7,10 @@
 -- Author: David Wheeler <david@wheeler.net>
 
 INSERT INTO org (id, name)
-VALUES (1, 'Internal');
+VALUES ('1', 'Internal');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (428, 3, 3, 1);
+VALUES ('428', '3', '3', '1');
 
 INSERT INTO org_member (id, object_id, member__id)
-VALUES (1, 1, 428); 
+VALUES ('1', '1', '428'); 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -27,31 +27,24 @@
 --
 
 CREATE TABLE output_channel (
-    id	         NUMERIC(10,0)  NOT NULL
-                                DEFAULT NEXTVAL('seq_output_channel'),
+    id	         INTEGER            NOT NULL
+                                    DEFAULT NEXTVAL('seq_output_channel'),
     name             VARCHAR(64)    NOT NULL,
     description      VARCHAR(256),
-    site__id         NUMERIC(10,0)  NOT NULL,
+    site__id         INTEGER        NOT NULL,
     protocol         VARCHAR(16),
     pre_path         VARCHAR(64),
     post_path        VARCHAR(64),
     filename         VARCHAR(32)    NOT NULL,
     file_ext         VARCHAR(32),
-    primary_ce       NUMERIC(1,0),
+    primary_ce       BOOLEAN,
     uri_format       VARCHAR(64)    NOT NULL,
     fixed_uri_format VARCHAR(64)    NOT NULL,
-    uri_case         NUMERIC(1,0)   NOT NULL
-                                    DEFAULT 1
-                                    CONSTRAINT ck_output_channel__uri_case
-                                      CHECK (uri_case IN (1,2,3)),
-    use_slug         NUMERIC(1,0)   NOT NULL
-                                    DEFAULT 0
-                                    CONSTRAINT ck_output_channel__use_slug
-                                      CHECK (use_slug IN (0,1)),
-    active           NUMERIC(1,0)   NOT NULL
-                                    DEFAULT 1
-                                    CONSTRAINT ck_output_channel__active
-                                      CHECK (active IN (0,1)),
+    uri_case         INT2           NOT NULL DEFAULT 1
+                                     CONSTRAINT ck_output_channel__uri_case
+                                     CHECK (uri_case IN (1,2,3)),
+    use_slug         BOOLEAN        NOT NULL DEFAULT FALSE,
+    active           BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_output_channel__id PRIMARY KEY (id)
 );
 
@@ -61,10 +54,10 @@
 --
 
 CREATE TABLE output_channel_include (
-    id          NUMERIC(10,0)  NOT NULL
+    id                         INTEGER  NOT NULL
                                DEFAULT NEXTVAL('seq_output_channel_include'),
-    output_channel__id         NUMERIC(10,0)  NOT NULL,
-    include_oc_id              NUMERIC(10,0)  NOT NULL
+    output_channel__id         INTEGER  NOT NULL,
+    include_oc_id              INTEGER  NOT NULL
                                CONSTRAINT ck_oc_include__include_oc_id
                                  CHECK (include_oc_id <> output_channel__id),
     CONSTRAINT pk_output_channel_include__id PRIMARY KEY (id)
@@ -75,10 +68,10 @@
 --
 
 CREATE TABLE output_channel_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_output_channel_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER  NOT NULL
+                         DEFAULT NEXTVAL('seq_output_channel_member'),
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_output_channel_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.val	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/OutputChannel.val	2004-11-09 03:32:57 UTC (rev \
6066) @@ -9,14 +9,14 @@
 INSERT INTO output_channel (id, name, description, pre_path, post_path,
 	                    filename, file_ext, uri_format, fixed_uri_format,
                             uri_case, use_slug, primary_ce, site__id)
-VALUES (1, 'Web', 'Output to the web', '', '', 'index', 'html',
-        '/categories/year/month/day/slug/', '/categories/', 1, 0, 1, 100);
+VALUES ('1', 'Web', 'Output to the web', '', '', 'index', 'html',
+        '/categories/year/month/day/slug/', '/categories/', '1', '0', '1', '100');
 
 
 -- Add 'em to the 'All Output Channels' Group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (436, 23, 21, 1);
+VALUES ('436', '23', '21', '1');
 
 INSERT INTO output_channel_member (id, object_id, member__id)
-VALUES (1, 1, 436);
+VALUES ('1', '1', '436');
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Person/User.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Person/User.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Person/User.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -15,13 +15,10 @@
 --
 
 CREATE TABLE usr (
-    id           NUMERIC(10, 0)    NOT NULL,
+    id           INTEGER           NOT NULL,
     login        VARCHAR(128)      NOT NULL,
     password     CHAR(32)          NOT NULL,
-    active       NUMERIC(1, 0)     NOT NULL 
-                                   DEFAULT 1
-                                   CONSTRAINT ck_usr__active
-                                     CHECK (active IN (1,0)),
+    active       BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_usr__id PRIMARY KEY (id)
 );
 
@@ -29,5 +26,5 @@
 -- INDEXES.
 --
 CREATE INDEX idx_usr__login ON usr(LOWER(login));
-CREATE UNIQUE INDEX udx_usr__login ON usr(LOWER(login)) WHERE active = 1;
+CREATE UNIQUE INDEX udx_usr__login ON usr(LOWER(login)) WHERE active = '1';
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Person/User.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Person/User.val	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Person/User.val	2004-11-09 03:32:57 UTC (rev \
6066) @@ -9,20 +9,20 @@
 -- Administrator. Password: 'change me now!'.
 
 INSERT INTO usr (id, login, password, active)
-VALUES (0, 'admin', 'd901271082743310476e5e7245e42120', 1);
+VALUES ('0', 'admin', 'd901271082743310476e5e7245e42120', '1');
 
 -- Add 'em to the 'All Users' Group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (1, 2, 2, 1);
+VALUES ('1', '2', '2', '1');
 
 INSERT INTO user_member (id, object_id, member__id)
-VALUES (0, 0, 1); 
+VALUES ('0', '0', '1'); 
 
 -- Add 'em to the 'Global Admins' Group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (2, 6, 2, 1);
+VALUES ('2', '6', '2', '1');
 
 INSERT INTO user_member (id, object_id, member__id)
-VALUES (1, 0, 2); 
+VALUES ('1', '0', '2'); 
 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Person.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Person.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Person.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -13,17 +13,14 @@
 --
 
 CREATE TABLE person (
-    id        NUMERIC(10, 0)    NOT NULL
+    id        INTEGER           NOT NULL
                                 DEFAULT NEXTVAL('seq_person'),
     prefix    VARCHAR(32),
     lname     VARCHAR(64),
     fname     VARCHAR(64),
     mname     VARCHAR(64),
     suffix    VARCHAR(32),
-    active    NUMERIC(1, 0)     NOT NULL 
-                                DEFAULT 1
-                                CONSTRAINT ck_person__active
-                                  CHECK (active IN (1,0)),
+    active    BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_person__id PRIMARY KEY (id)
 );
 
@@ -34,10 +31,10 @@
 --
 
 CREATE TABLE person_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_person_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER         NOT NULL
+                                DEFAULT NEXTVAL('seq_person_member'),
+    object_id   INTEGER         NOT NULL,
+    member__id  INTEGER         NOT NULL,
     CONSTRAINT pk_person_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Person.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Person.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Person.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -9,12 +9,12 @@
 -- Administrator.
 
 INSERT INTO person (id, lname, fname, mname, prefix, suffix, active)
-VALUES (0, 'Administrator', 'Bricolage', '', '', '', 1);
+VALUES ('0', 'Administrator', 'Bricolage', '', '', '', '1');
 
 -- Add 'em to the 'All Users' Group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (0, 1, 1, 1);
+VALUES ('0', '1', '1', '1');
 
 INSERT INTO person_member (id, object_id, member__id)
-VALUES (0, 0, 0); 
+VALUES ('0', '0', '0'); 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Site.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Site.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Site.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -13,14 +13,11 @@
 --
 
 CREATE TABLE site (
-    id          NUMERIC(10, 0)    NOT NULL,
+    id          INTEGER         NOT NULL,
     name        TEXT,
     description TEXT,
     domain_name TEXT,
-    active      NUMERIC(1, 0)     NOT NULL
-                                  DEFAULT 1
-                                  CONSTRAINT ck_site__active
-                                    CHECK (active IN (1,0)),
+    active      BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_site__id PRIMARY KEY (id)
 );
 
@@ -31,10 +28,10 @@
 --
 
 CREATE TABLE site_member (
-    id          NUMERIC(10,0)  NOT NULL
-                               DEFAULT NEXTVAL('seq_site_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    id          INTEGER  NOT NULL
+                         DEFAULT NEXTVAL('seq_site_member'),
+    object_id   INTEGER  NOT NULL,
+    member__id  INTEGER  NOT NULL,
     CONSTRAINT pk_site_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Site.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Site.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Site.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -9,12 +9,12 @@
 -- Default site.
 
 INSERT INTO site (id, name, description, domain_name, active)
-VALUES (100, 'Default Site', 'The default site', 'www.example.com', 1);
+VALUES ('100', 'Default Site', 'The default site', 'www.example.com', '1');
 
 -- Add it to the 'All Sites' Group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (59, 47, 75, 1);
+VALUES ('59', '47', '75', '1');
 
 INSERT INTO site_member (id, object_id, member__id)
-VALUES (1, 100, 59);
+VALUES ('1', '100', '59');
  
\ No newline at end of file

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -23,21 +23,15 @@
 -- Description: Represents a desk in the workflow
 
 CREATE TABLE desk (
-    id              NUMERIC(10)   NOT NULL
+    id              INTEGER       NOT NULL
                                   DEFAULT NEXTVAL('seq_desk'),
     name            VARCHAR(64)   NOT NULL,
     description     VARCHAR(256),
-    pre_chk_rules   NUMERIC(10),
-    post_chk_rules  NUMERIC(10),
-    asset_grp       NUMERIC(10),
-    publish         NUMERIC(1)    NOT NULL
-                                  DEFAULT 0
-                                  CONSTRAINT ck_desk__publish
-                                    CHECK (publish IN (0,1)),
-    active          NUMERIC(1)	  NOT NULL
-                                  DEFAULT 1
-                                  CONSTRAINT ck_desk__active
-                                    CHECK (active IN (0,1)),
+    pre_chk_rules   INTEGER,
+    post_chk_rules  INTEGER,
+    asset_grp       INTEGER,
+    publish         BOOLEAN       NOT NULL DEFAULT FALSE,
+    active          BOOLEAN  	  NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_desk__id PRIMARY KEY (id)
 );
 
@@ -48,10 +42,10 @@
 --
 
 CREATE TABLE desk_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_desk_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_desk_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.val	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Workflow/Parts/Desk.val	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -7,27 +7,27 @@
 --
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (0, 'Shelved', 'Hidden desk for shelved assets', NULL, NULL, 0, 0, 0);
+VALUES ('0', 'Shelved', 'Hidden desk for shelved assets', NULL, NULL, '0', '0', \
'0');  
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (101, 'Edit', 'Edit Desk', NULL, NULL, 61, 0, 1);
+VALUES ('101', 'Edit', 'Edit Desk', NULL, NULL, '61', '0', '1');
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (102, 'Copy', 'Copy Desk', NULL, NULL, 62, 0, 1);
+VALUES ('102', 'Copy', 'Copy Desk', NULL, NULL, '62', '0', '1');
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (103, 'Legal', 'Legal Desk', NULL, NULL, 63, 0, 1);
+VALUES ('103', 'Legal', 'Legal Desk', NULL, NULL, '63', '0', '1');
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (104, 'Publish', 'Publish Desk', NULL, NULL, 64, 1, 1);
+VALUES ('104', 'Publish', 'Publish Desk', NULL, NULL, '64', '1', '1');
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (105, 'Art', 'Art Desk', NULL, NULL, 65, 0, 1);
+VALUES ('105', 'Art', 'Art Desk', NULL, NULL, '65', '0', '1');
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (106, 'Development', 'Development Desk', NULL, NULL, 66, 0, 1);
+VALUES ('106', 'Development', 'Development Desk', NULL, NULL, '66', '0', '1');
 
 INSERT INTO desk (id, name, description, pre_chk_rules, post_chk_rules, asset_grp, \
                publish, active)
-VALUES (107, 'Deploy', 'Deploy Desk', NULL, NULL, 67, 1, 1);
+VALUES ('107', 'Deploy', 'Deploy Desk', NULL, NULL, '67', '1', '1');
 
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Workflow.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -21,20 +21,20 @@
 -- Description: The main workflow table.
 
 CREATE TABLE workflow (
-    id               NUMERIC(10)  NOT NULL
+    id               INTEGER      NOT NULL
                                   DEFAULT NEXTVAL('seq_workflow'),
     name             VARCHAR(64)  NOT NULL,
     description      VARCHAR(256) NOT NULL,
-    all_desk_grp_id  NUMERIC(10)  NOT NULL,
-    req_desk_grp_id  NUMERIC(10)  NOT NULL,
-    asset_grp_id     NUMERIC(10)  NOT NULL,
-    head_desk_id     NUMERIC(10)  NOT NULL,
-    type             NUMERIC(1)   NOT NULL,
-    active           NUMERIC(1)	  NOT NULL
+    all_desk_grp_id  INTEGER      NOT NULL,
+    req_desk_grp_id  INTEGER      NOT NULL,
+    asset_grp_id     INTEGER      NOT NULL,
+    head_desk_id     INTEGER      NOT NULL,
+    type             INT2         NOT NULL
                                   DEFAULT 1
-                                  CONSTRAINT ck_workflow__active
-                                    CHECK (active IN (0,1)),
-    site__id         NUMERIC(10)  NOT NULL,
+                                  CONSTRAINT ck_workflow__type
+                                    CHECK (type IN (1,2,3)),
+    active           BOOLEAN  	  NOT NULL DEFAULT TRUE,
+    site__id         INTEGER      NOT NULL,
     CONSTRAINT pk_workflow__id PRIMARY KEY (id)
 );
 
@@ -43,10 +43,10 @@
 --
 
 CREATE TABLE workflow_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_workflow_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_workflow_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Biz/Workflow.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Biz/Workflow.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Biz/Workflow.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -8,266 +8,266 @@
 
 INSERT INTO workflow (id, name, description, asset_grp_id, all_desk_grp_id,
                       req_desk_grp_id, head_desk_id, type, active, site__id)
-VALUES (0, 'Shelved', 'Hidden workflow for shelved assets', 0, 41, 42, 0, 2, 0, \
100); +VALUES ('0', 'Shelved', 'Hidden workflow for shelved assets', '0', '41', '42', \
'0', '2', '0', '100');  
 INSERT INTO workflow (id, name, description, asset_grp_id, all_desk_grp_id,
                       req_desk_grp_id, head_desk_id, type, active, site__id)
-VALUES (101, 'Story', 'Story Workflow', 49, 41, 42, 101, 2, 1, 100);
+VALUES ('101', 'Story', 'Story Workflow', '49', '41', '42', '101', '2', '1', '100');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (407, 25, 44, 1);
+VALUES ('407', '25', '44', '1');
 
 INSERT INTO workflow_member(id, object_id, member__id)
-VALUES (1, 101, 407);
+VALUES ('1', '101', '407');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (49, NULL, 43, 'Workflow Assets', 'Assets group for workflow permissions', 1, \
0, 1); +VALUES ('49', NULL, '43', 'Workflow Assets', 'Assets group for workflow \
permissions', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (180, 35, 6, 1);
+VALUES ('180', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (180, 49, 180);
+VALUES ('180', '49', '180');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (41, NULL, 40, 'All Workflow Desks', 'All desks available to a workflow', 1, \
0, 1); +VALUES ('41', NULL, '40', 'All Workflow Desks', 'All desks available to a \
workflow', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (501, 35, 6, 1);
+VALUES ('501', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (50, 41, 501);
+VALUES ('50', '41', '501');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (42, NULL, 40, 'Required Workflow Desks', 'Desks required in a workflow', 1, \
0, 1); +VALUES ('42', NULL, '40', 'Required Workflow Desks', 'Desks required in a \
workflow', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (502, 35, 6, 1);
+VALUES ('502', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (51, 42, 502);
+VALUES ('51', '42', '502');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (201, 41, 45, 1);
+VALUES ('201', '41', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (101, 101, 201);
+VALUES ('101', '101', '201');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (202, 42, 45, 1);
+VALUES ('202', '42', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (102, 101, 202);
+VALUES ('102', '101', '202');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (203, 41, 45, 1);
+VALUES ('203', '41', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (103, 102, 203);
+VALUES ('103', '102', '203');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (204, 41, 45, 1);
+VALUES ('204', '41', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (104, 103, 204);
+VALUES ('104', '103', '204');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (205, 42, 45, 1);
+VALUES ('205', '42', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (105, 103, 205);
+VALUES ('105', '103', '205');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (206, 41, 45, 1);
+VALUES ('206', '41', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (106, 104, 206);
+VALUES ('106', '104', '206');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (207, 42, 45, 1);
+VALUES ('207', '42', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (107, 104, 207);
+VALUES ('107', '104', '207');
 
 
 INSERT INTO workflow (id, name, description, asset_grp_id, all_desk_grp_id,
                       req_desk_grp_id, head_desk_id, type, active, site__id)
-VALUES (102, 'Media', 'Media Workflow', 51, 43, 44, 105, 3, 1, 100);
+VALUES ('102', 'Media', 'Media Workflow', '51', '43', '44', '105', '3', '1', '100');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (408, 25, 44, 1);
+VALUES ('408', '25', '44', '1');
 
 INSERT INTO workflow_member(id, object_id, member__id)
-VALUES (2, 102, 408);
+VALUES ('2', '102', '408');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (51, NULL, 43, 'Workflow Assets', 'Assets group for workflow permissions', 1, \
0, 1); +VALUES ('51', NULL, '43', 'Workflow Assets', 'Assets group for workflow \
permissions', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (181, 35, 6, 1);
+VALUES ('181', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (181, 51, 181);
+VALUES ('181', '51', '181');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (43, NULL, 40, 'All Workflow Desks', 'All desks available to a workflow', 1, \
0, 1); +VALUES ('43', NULL, '40', 'All Workflow Desks', 'All desks available to a \
workflow', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (503, 35, 6, 1);
+VALUES ('503', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (52, 43, 503);
+VALUES ('52', '43', '503');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (44, NULL, 40, 'Required Workflow Desks', 'Desks required in a workflow', 1, \
0, 1); +VALUES ('44', NULL, '40', 'Required Workflow Desks', 'Desks required in a \
workflow', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (504, 35, 6, 1);
+VALUES ('504', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (53, 44, 504);
+VALUES ('53', '44', '504');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (208, 43, 45, 1);
+VALUES ('208', '43', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (108, 105, 208);
+VALUES ('108', '105', '208');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (209, 44, 45, 1);
+VALUES ('209', '44', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (109, 105, 209);
+VALUES ('109', '105', '209');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (210, 43, 45, 1);
+VALUES ('210', '43', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (110, 103, 210);
+VALUES ('110', '103', '210');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (211, 44, 45, 1);
+VALUES ('211', '44', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (111, 103, 211);
+VALUES ('111', '103', '211');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (212, 43, 45, 1);
+VALUES ('212', '43', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (112, 104, 212);
+VALUES ('112', '104', '212');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (213, 44, 45, 1);
+VALUES ('213', '44', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (113, 104, 213);
+VALUES ('113', '104', '213');
 
 
 INSERT INTO workflow (id, name, description, asset_grp_id, all_desk_grp_id,
                       req_desk_grp_id, head_desk_id, type, active, site__id)
-VALUES (103, 'Template', 'Template Workflow', 52, 45, 46, 106, 1, 1, 100);
+VALUES ('103', 'Template', 'Template Workflow', '52', '45', '46', '106', '1', '1', \
'100');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (409, 25, 44, 1);
+VALUES ('409', '25', '44', '1');
 
 INSERT INTO workflow_member(id, object_id, member__id)
-VALUES (3, 103, 409);
+VALUES ('3', '103', '409');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (52, NULL, 43, 'Workflow Assets', 'Assets group for workflow permissions', 1, \
0, 1); +VALUES ('52', NULL, '43', 'Workflow Assets', 'Assets group for workflow \
permissions', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (182, 35, 6, 1);
+VALUES ('182', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (182, 52, 182);
+VALUES ('182', '52', '182');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (45, NULL, 40, 'All Workflow Desks', 'All desks available to a workflow', 1, \
0, 1); +VALUES ('45', NULL, '40', 'All Workflow Desks', 'All desks available to a \
workflow', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (505, 35, 6, 1);
+VALUES ('505', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (54, 45, 505);
+VALUES ('54', '45', '505');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, \
                active)
-VALUES (46, NULL, 40, 'Required Workflow Desks', 'Desks required in a workflow', 1, \
0, 1); +VALUES ('46', NULL, '40', 'Required Workflow Desks', 'Desks required in a \
workflow', '1', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (506, 35, 6, 1);
+VALUES ('506', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (55, 46, 506);
+VALUES ('55', '46', '506');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (214, 45, 45, 1);
+VALUES ('214', '45', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (114, 106, 214);
+VALUES ('114', '106', '214');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (215, 46, 45, 1);
+VALUES ('215', '46', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (115, 106, 215);
+VALUES ('115', '106', '215');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (216, 45, 45, 1);
+VALUES ('216', '45', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (116, 107, 216);
+VALUES ('116', '107', '216');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (217, 46, 45, 1);
+VALUES ('217', '46', '45', '1');
 
 INSERT INTO desk_member(id, object_id, member__id)
-VALUES (117, 107, 217);
+VALUES ('117', '107', '217');
 
 /* All Desks Group */
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (171, 34, 45, 1);
+VALUES ('171', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (121, 101, 171);
+VALUES ('121', '101', '171');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (172, 34, 45, 1);
+VALUES ('172', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (122, 102, 172);
+VALUES ('122', '102', '172');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (173, 34, 45, 1);
+VALUES ('173', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (123, 103, 173);
+VALUES ('123', '103', '173');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (174, 34, 45, 1);
+VALUES ('174', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (124, 104, 174);
+VALUES ('124', '104', '174');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (175, 34, 45, 1);
+VALUES ('175', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (125, 105, 175);
+VALUES ('125', '105', '175');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (176, 34, 45, 1);
+VALUES ('176', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (126, 106, 176);
+VALUES ('126', '106', '176');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (177, 34, 45, 1);
+VALUES ('177', '34', '45', '1');
 
 INSERT INTO desk_member (id, object_id, member__id)
-VALUES (127, 107, 177);
+VALUES ('127', '107', '177');
 
 
 

Modified: bricolage/trunk/sql/Pg/Bric/Dist/Action.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Dist/Action.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Dist/Action.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -20,15 +20,12 @@
 --
 
 CREATE TABLE action (
-    id               NUMERIC(10, 0)    NOT NULL
+    id               INTEGER           NOT NULL
                                        DEFAULT NEXTVAL('seq_action'),
-    ord              NUMERIC(3, 0)     NOT NULL,
-    server_type__id  NUMERIC(10, 0)    NOT NULL,
-    action_type__id  NUMERIC(10, 0)    NOT NULL,
-    active           NUMERIC(1, 0)     NOT NULL
-                                       DEFAULT 1
-                                       CONSTRAINT ck_action__active
-                                         CHECK (active IN (1,0)),
+    ord              INT2              NOT NULL,
+    server_type__id  INTEGER           NOT NULL,
+    action_type__id  INTEGER           NOT NULL,
+    active           BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_action__id PRIMARY KEY (id)
 );
 
@@ -38,15 +35,12 @@
 --
 
 CREATE TABLE attr_action (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_action'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_action__active
-                               CHECK (active IN (0,1)),
+    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_action__id PRIMARY KEY (id)
 );
 
@@ -56,18 +50,15 @@
 --
 
 CREATE TABLE attr_action_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_action_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_action_val__active
-				   CHECK (active IN (0,1)),
+    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_action_val__id PRIMARY KEY (id)
 );
 
@@ -77,14 +68,12 @@
 --
 
 CREATE TABLE attr_action_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_attr_action_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_action_meta__active CHECK (active \
IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_action_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Dist/ActionType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Dist/ActionType.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Dist/ActionType.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -17,14 +17,11 @@
 --
 
 CREATE TABLE action_type (
-    id            NUMERIC(10, 0)    NOT NULL
+    id            INTEGER           NOT NULL
                                     DEFAULT NEXTVAL('seq_action_type'),
     name          VARCHAR(64)       NOT NULL,
     description   VARCHAR(256),
-    active        NUMERIC(1, 0)     NOT NULL 
-                                    DEFAULT 0
-                                    CONSTRAINT ck_action_type__active
-                                      CHECK (active IN (1,0)),
+    active        BOOLEAN           NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_action_type__id PRIMARY KEY (id)
 );
 
@@ -34,8 +31,8 @@
 --
 
 CREATE TABLE action_type__media_type (
-    action_type__id  NUMERIC(10, 0)    NOT NULL,
-    media_type__id    NUMERIC(10, 0)    NOT NULL,
+    action_type__id   INTEGER          NOT NULL,
+    media_type__id    INTEGER          NOT NULL,
     CONSTRAINT pk_action__media_type PRIMARY KEY (action_type__id, media_type__id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Dist/ActionType.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Dist/ActionType.val	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Dist/ActionType.val	2004-11-09 03:32:57 UTC (rev \
6066) @@ -6,50 +6,50 @@
 -- Author:  David Wheeler <david@wheeler.net>
 
 INSERT INTO action_type ( id, name, description, active)
-VALUES (1, 'Move', 'Puts resources on servers.', 1);
+VALUES ('1', 'Move', 'Puts resources on servers.', '1');
 
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (1, 0);
+VALUES ('1', '0');
 
 INSERT INTO action_type ( id, name, description, active)
-VALUES (4, 'Email', 'Email resources.', 1);
+VALUES ('4', 'Email', 'Email resources.', '1');
 
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (4, 0);
+VALUES ('4', '0');
 
 INSERT INTO action_type ( id, name, description, active)
-VALUES (5, 'DTD Validation', 'XML DTD validation.', 1);
+VALUES ('5', 'DTD Validation', 'XML DTD validation.', '1');
 
 /* Associate with text/html */
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (5, 77);
+VALUES ('5', '77');
 
 /* Associate with text/xml */
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (5, 86);
+VALUES ('5', '86');
 
 /* Associate with application/xhtml+xml */
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (5, 92);
+VALUES ('5', '92');
 
 /*
 
 These can be added back in once these modules have actually been implemented.
 
 INSERT INTO action_type ( id, name, description, active)
-VALUES (2, 'Akamaize', 'Akamaizes HTML resources.', 1);
+VALUES ('2', 'Akamaize', 'Akamaizes HTML resources.', '1');
 
 INSERT INTO action_type ( id, name, description, active)
-VALUES (3, 'Clean HTML', 'Cleans and reformats HTML Resources.', 1);
+VALUES ('3', 'Clean HTML', 'Cleans and reformats HTML Resources.', '1');
 
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (2, 77);
+VALUES ('2', '77');
 
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (3, 77);
+VALUES ('3', '77');
 
 INSERT INTO action_type__media_type (action_type__id, media_type__id)
-VALUES (3, 78);
+VALUES ('3', '78');
 
 */
 

Modified: bricolage/trunk/sql/Pg/Bric/Dist/Resource.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Dist/Resource.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Dist/Resource.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -18,8 +18,8 @@
 --
 
 CREATE TABLE media__resource(
-    resource__id    NUMERIC(10, 0)    NOT NULL,
-    media__id       NUMERIC(10, 0)    NOT NULL,
+    resource__id    INTEGER           NOT NULL,
+    media__id       INTEGER           NOT NULL,
     CONSTRAINT pk_media__resource PRIMARY KEY (media__id, resource__id)
 );
 
@@ -29,15 +29,15 @@
 --
 
 CREATE TABLE resource(
-    id                  NUMERIC(10, 0)    NOT NULL
+    id                  INTEGER           NOT NULL
                                           DEFAULT NEXTVAL('seq_resource'),
-    parent_id           NUMERIC(10, 0),
-    media_type__id      NUMERIC(10, 0)    NOT NULL,
+    parent_id           INTEGER,
+    media_type__id      INTEGER           NOT NULL,
     path                VARCHAR(256)      NOT NULL,
     uri                 VARCHAR(256)      NOT NULL,
-    size                NUMERIC(10, 0)    NOT NULL,
+    size                INTEGER           NOT NULL,
     mod_time            TIMESTAMP         NOT NULL,
-    is_dir              NUMERIC(1, 0)     NOT NULL,
+    is_dir              BOOLEAN           NOT NULL,
     CONSTRAINT pk_resource__id PRIMARY KEY (id)
 );
 
@@ -47,8 +47,8 @@
 --
 
 CREATE TABLE story__resource(
-    story__id       NUMERIC(10, 0)    NOT NULL,
-    resource__id    NUMERIC(10, 0)    NOT NULL,
+    story__id       INTEGER           NOT NULL,
+    resource__id    INTEGER           NOT NULL,
     CONSTRAINT pk_story__resource PRIMARY KEY (story__id,resource__id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Dist/Server.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Dist/Server.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Dist/Server.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -10,19 +10,16 @@
 -- TABLE: server 
 --
 CREATE TABLE server(
-    id                 NUMERIC(10, 0)   NOT NULL
+    id                 INTEGER          NOT NULL
                                         DEFAULT NEXTVAL('seq_server'),
-    server_type__id    NUMERIC(10, 0)   NOT NULL,
+    server_type__id    INTEGER          NOT NULL,
     host_name          VARCHAR(128)     NOT NULL,
-    os		       CHAR(5)		NOT NULL,
+    os		           CHAR(5)		    NOT NULL,
     doc_root           VARCHAR(128)     NOT NULL,
     login              VARCHAR(64),
     password           VARCHAR(64),
     cookie             VARCHAR(512),
-    active             NUMERIC(1, 0)   NOT NULL
-                                       DEFAULT 1
-                                       CONSTRAINT ck_server__active
-                                         CHECK (active IN (1,0)),
+    active             BOOLEAN          NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_server__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Dist/ServerType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Dist/ServerType.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Dist/ServerType.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -11,28 +11,16 @@
 --
 
 CREATE TABLE server_type(
-    id             NUMERIC(10, 0)    NOT NULL
+    id             INTEGER           NOT NULL
                                      DEFAULT NEXTVAL('seq_server_type'),
-    class__id      NUMERIC(10, 0)    NOT NULL,
+    class__id      INTEGER           NOT NULL,
     name           VARCHAR(64)       NOT NULL,
     description    VARCHAR(256),
-    site__id       NUMERIC(10, 0)    NOT NULL,
-    copyable       NUMERIC(1, 0)     NOT NULL
-                                     DEFAULT 0
-                                     CONSTRAINT ck_server_type__copyable
-                                       CHECK (copyable IN (1,0)),
-    publish        NUMERIC(1, 0)     NOT NULL
-                                     DEFAULT 1
-                                     CONSTRAINT ck_server_type__publish
-                                       CHECK (publish IN (1,0)),
-    preview        NUMERIC(1, 0)     NOT NULL
-                                     DEFAULT 0
-                                     CONSTRAINT ck_server_type__preview
-                                       CHECK (preview IN (1,0)),
-    active         NUMERIC(1, 0)     NOT NULL
-                                     DEFAULT 1
-                                     CONSTRAINT ck_server_type__active
-                                       CHECK (active IN (1,0)),
+    site__id       INTEGER           NOT NULL,
+    copyable       BOOLEAN           NOT NULL DEFAULT FALSE,
+    publish        BOOLEAN           NOT NULL DEFAULT TRUE,
+    preview        BOOLEAN           NOT NULL DEFAULT FALSE,
+    active         BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_server_type__id PRIMARY KEY (id)
 );
 
@@ -42,8 +30,8 @@
 --
 
 CREATE TABLE server_type__output_channel(
-    server_type__id    NUMERIC(10, 0)  NOT NULL,
-    output_channel__id NUMERIC(10, 0)  NOT NULL,
+    server_type__id    INTEGER         NOT NULL,
+    output_channel__id INTEGER         NOT NULL,
     CONSTRAINT pk_server_type__output_channel
       PRIMARY KEY (server_type__id, output_channel__id)
 );
@@ -54,10 +42,10 @@
 --
 
 CREATE TABLE dest_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_dest_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_dest_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Alert.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Alert.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Alert.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -12,10 +12,10 @@
 --
 
 CREATE TABLE alert(
-    id                NUMERIC(10, 0)    NOT NULL
+    id                INTEGER           NOT NULL
                                         DEFAULT NEXTVAL('seq_alert'),
-    alert_type__id    NUMERIC(10, 0)    NOT NULL,
-    event__id         NUMERIC(10, 0)    NOT NULL,
+    alert_type__id    INTEGER           NOT NULL,
+    event__id         INTEGER           NOT NULL,
     subject           VARCHAR(128),
     message           VARCHAR(512),
     timestamp         TIMESTAMP         NOT NULL

Modified: bricolage/trunk/sql/Pg/Bric/Util/AlertType/Parts/Rule.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/AlertType/Parts/Rule.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/AlertType/Parts/Rule.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -12,9 +12,9 @@
 --
 
 CREATE TABLE alert_type_rule(
-    id                NUMERIC(10, 0)  NOT NULL
+    id                INTEGER         NOT NULL
                                       DEFAULT NEXTVAL('seq_alert_type_rule'),
-    alert_type__id    NUMERIC(10, 0)  NOT NULL,
+    alert_type__id    INTEGER         NOT NULL,
     attr              VARCHAR(64)     NOT NULL,
     operator          CHAR(2)         NOT NULL,
     value             VARCHAR(256)    NOT NULL,

Modified: bricolage/trunk/sql/Pg/Bric/Util/AlertType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/AlertType.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/AlertType.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -12,19 +12,15 @@
 --
 
 CREATE TABLE alert_type (
-    id                NUMERIC(10, 0)    NOT NULL
+    id                INTEGER           NOT NULL
                                         DEFAULT NEXTVAL('seq_alert_type'),
-    event_type__id    NUMERIC(10, 0)    NOT NULL,
-    usr__id           NUMERIC(10, 0)    NOT NULL,
+    event_type__id    INTEGER           NOT NULL,
+    usr__id           INTEGER           NOT NULL,
     name              VARCHAR(64)       NOT NULL,
     subject           VARCHAR(128),
     message           VARCHAR(512),
-    active            NUMERIC(1, 0)     NOT NULL 
-                                        CONSTRAINT ck_alert_type__active CHECK \
                (active IN (1,0))
-                                        DEFAULT 1,
-    del               NUMERIC(1, 0)     NOT NULL 
-                                        CONSTRAINT ck_alert_type__del CHECK (del IN \
                (1,0))
-                                        DEFAULT 0,
+    active            BOOLEAN           NOT NULL DEFAULT TRUE,
+    del               BOOLEAN           NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_alert_type__id PRIMARY KEY (id)
 );
 
@@ -34,9 +30,9 @@
 --
 
 CREATE TABLE alert_type__grp__contact(
-    alert_type__id    NUMERIC(10, 0)    NOT NULL,
-    contact__id       NUMERIC(10, 0)    NOT NULL,
-    grp__id           NUMERIC(10, 0)    NOT NULL,
+    alert_type__id    INTEGER           NOT NULL,
+    contact__id       INTEGER           NOT NULL,
+    grp__id           INTEGER           NOT NULL,
     CONSTRAINT pk_alert_type__grp__contact PRIMARY KEY (alert_type__id, contact__id, \
grp__id)  );
 
@@ -46,9 +42,9 @@
 --
 
 CREATE TABLE alert_type__usr__contact(
-    alert_type__id    NUMERIC(10, 0)    NOT NULL,
-    contact__id       NUMERIC(10, 0)    NOT NULL,
-    usr__id           NUMERIC(10, 0)    NOT NULL,
+    alert_type__id    INTEGER           NOT NULL,
+    contact__id       INTEGER           NOT NULL,
+    usr__id           INTEGER           NOT NULL,
     CONSTRAINT pk_alert_type__usr__contact PRIMARY KEY (alert_type__id, usr__id, \
contact__id)  );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Alerted.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Alerted.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Alerted.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -12,10 +12,10 @@
 --
 
 CREATE TABLE alerted(
-    id           NUMERIC(10, 0)    NOT NULL
+    id           INTEGER           NOT NULL
                                    DEFAULT NEXTVAL('seq_alerted'),
-    usr__id      NUMERIC(10, 0)    NOT NULL,
-    alert__id    NUMERIC(10, 0)    NOT NULL,
+    usr__id      INTEGER           NOT NULL,
+    alert__id    INTEGER           NOT NULL,
     ack_time     TIMESTAMP,
     CONSTRAINT pk_alerted__id PRIMARY KEY (id)
 );
@@ -26,8 +26,8 @@
 --
 
 CREATE TABLE alerted__contact_value(
-    alerted__id	            NUMERIC(10, 0)  NOT NULL,
-    contact__id             NUMERIC(10, 0)  NOT NULL,
+    alerted__id	            INTEGER         NOT NULL,
+    contact__id             INTEGER         NOT NULL,
     contact_value__value    VARCHAR(256)    NOT NULL,
     sent_time               TIMESTAMP,
     CONSTRAINT pk_alerted__contact_value PRIMARY KEY (alerted__id, contact__id, \
contact_value__value)

Modified: bricolage/trunk/sql/Pg/Bric/Util/Async.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Async.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Async.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -18,15 +18,12 @@
 -- 
 
 CREATE TABLE async (
-    id           NUMERIC(10,0) NOT NULL
+    id           INTEGER       NOT NULL
                                DEFAULT NEXTVAL('seq_async'),
     name         VARCHAR(32)   NOT NULL,
     description  VARCHAR(256),
     file_name    VARCHAR(128),
-    active       NUMERIC(1,0)  NOT NULL
-                               DEFAULT 1
-                               CONSTRAINT ck_async__active
-                                          CHECK (active IN (0,1)),
+    active       BOOLEAN       NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_async__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Attribute.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Attribute.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Attribute.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -40,14 +40,12 @@
 --              its subsystem, its person ID and an attribute name.
 
 CREATE TABLE attr_person (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_person'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_person__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_person__id PRIMARY KEY (id)
 );
 
@@ -58,17 +56,15 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_person_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_person_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_person_val__active CHECK (active \
IN (0,1)), +    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_person_val__id PRIMARY KEY (id)
 );
 
@@ -78,14 +74,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_person_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_attr_person_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_person_meta__active CHECK (active \
IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_person_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Class.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Class.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Class.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -19,7 +19,7 @@
 --        For keeping track of Perl classes.
 
 CREATE TABLE class(
-    id              NUMERIC(10, 0)  NOT NULL
+    id              INTEGER         NOT NULL
                                     DEFAULT NEXTVAL('seq_class'),
     key_name        VARCHAR(32)     NOT NULL
                                     CONSTRAINT ck_class__key_name
@@ -28,10 +28,7 @@
     disp_name       VARCHAR(128)    NOT NULL,
     plural_name	    VARCHAR(128)    NOT NULL,
     description     VARCHAR(256),
-    distributor     NUMERIC(1, 0)   NOT NULL 
-                                    CONSTRAINT ck_class__distributor 
-                                        CHECK (distributor IN (1,0))
-                                    DEFAULT 0,
+    distributor     BOOLEAN         NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_class__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Class.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Class.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Class.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -10,247 +10,247 @@
 -- Table: class
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (0, 'bric', 'Bric', 'Bricolage', 'Bricolagen', 'Bricolage Root Class', 0);
+VALUES ('0', 'bric', 'Bric', 'Bricolage', 'Bricolagen', 'Bricolage Root Class', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (1, 'person', 'Bric::Biz::Person', 'Person', 'People', 'Person objects', 0);
+VALUES ('1', 'person', 'Bric::Biz::Person', 'Person', 'People', 'Person objects', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (2, 'user', 'Bric::Biz::Person::User', 'User', 'Users', 'User objects', 0);
+VALUES ('2', 'user', 'Bric::Biz::Person::User', 'User', 'Users', 'User objects', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (3, 'org', 'Bric::Biz::Org', 'Organization', 'Organizations', 'Organization \
objects', 0); +VALUES ('3', 'org', 'Bric::Biz::Org', 'Organization', 'Organizations', \
'Organization objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (4, 'event_type', 'Bric::Util::EventType', 'Event Type', 'Event Types', \
'Event Type objects', 0); +VALUES ('4', 'event_type', 'Bric::Util::EventType', 'Event \
Type', 'Event Types', 'Event Type objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (5, 'event', 'Bric::Util::Event', 'Event', 'Events', 'Event objects', 0);
+VALUES ('5', 'event', 'Bric::Util::Event', 'Event', 'Events', 'Event objects', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (6, 'grp', 'Bric::Util::Grp', 'Group', 'Groups', 'Group objects', 0);
+VALUES ('6', 'grp', 'Bric::Util::Grp', 'Group', 'Groups', 'Group objects', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (7, 'event_grp', 'Bric::Util::Grp::Event', 'Event Group', 'Event Groups', \
'Event Group objects', 0); +VALUES ('7', 'event_grp', 'Bric::Util::Grp::Event', \
'Event Group', 'Event Groups', 'Event Group objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (8, 'user_grp', 'Bric::Util::Grp::User', 'User Group', 'User Groups', 'User \
Group objects', 0); +VALUES ('8', 'user_grp', 'Bric::Util::Grp::User', 'User Group', \
'User Groups', 'User Group objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (9, 'contrib_type', 'Bric::Util::Grp::Person', 'Contributor Type', \
'Contributor Types', 'Contributor Type objects', 0); +VALUES ('9', 'contrib_type', \
'Bric::Util::Grp::Person', 'Contributor Type', 'Contributor Types', 'Contributor Type \
objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (10, 'story', 'Bric::Biz::Asset::Business::Story', 'Story', 'Stories', 'Story \
Asset objects', 0); +VALUES ('10', 'story', 'Bric::Biz::Asset::Business::Story', \
'Story', 'Stories', 'Story Asset objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (11, 'ftp', 'Bric::Util::Trans::FTP', 'FTP', 'FTP Transport', 'Class with \
methods to move files via FTP.', 1); +VALUES ('11', 'ftp', 'Bric::Util::Trans::FTP', \
'FTP', 'FTP Transport', 'Class with methods to move files via FTP.', '1');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (12, 'fs', 'Bric::Util::Trans::FS', 'File System', 'File System Transport', \
'Class with methods to move files within the file system.', 1); +VALUES ('12', 'fs', \
'Bric::Util::Trans::FS', 'File System', 'File System Transport', 'Class with methods \
to move files within the file system.', '1');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (13, 'mail', 'Bric::Util::Trans::Mail', 'Email', 'Email Transport', 'Class \
with methods to send email.', 0); +VALUES ('13', 'mail', 'Bric::Util::Trans::Mail', \
'Email', 'Email Transport', 'Class with methods to send email.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (14, 'action', 'Bric::Dist::Action', 'Action', 'Actions', 'Factory class for \
distribution actions.', 0); +VALUES ('14', 'action', 'Bric::Dist::Action', 'Action', \
'Actions', 'Factory class for distribution actions.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (15, 'akamaize', 'Bric::Dist::Action::Akamaize', 'Akamaize', 'Akamaize', \
'Action subclass that akamaizes resources.', 0); +VALUES ('15', 'akamaize', \
'Bric::Dist::Action::Akamaize', 'Akamaize', 'Akamaize', 'Action subclass that \
akamaizes resources.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (16, 'html_clean', 'Bric::Dist::Action::HTMLClean', 'Clean HTML', 'Clean \
HTML', 'Action subclass that cleans up and reformats HTML to make it nice and neat.', \
0); +VALUES ('16', 'html_clean', 'Bric::Dist::Action::HTMLClean', 'Clean HTML', \
'Clean HTML', 'Action subclass that cleans up and reformats HTML to make it nice and \
neat.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (17, 'org_grp', 'Bric::Util::Grp::Org', 'Organization Group', 'Organization \
Groups', 'Organization Group objects', 0); +VALUES ('17', 'org_grp', \
'Bric::Util::Grp::Org', 'Organization Group', 'Organization Groups', 'Organization \
Group objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (18, 'alert_type_grp', 'Bric::Util::Grp::AlertType', 'Alert Type Group', \
'Alert Type Groups', 'Alert Type Group objects', 0); +VALUES ('18', 'alert_type_grp', \
'Bric::Util::Grp::AlertType', 'Alert Type Group', 'Alert Type Groups', 'Alert Type \
Group objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (19, 'formatting', 'Bric::Biz::Asset::Formatting', 'Template', 'Templates', \
'Templates', 0); +VALUES ('19', 'formatting', 'Bric::Biz::Asset::Formatting', \
'Template', 'Templates', 'Templates', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor) 
-VALUES (20, 'category', 'Bric::Biz::Category', 'Category', 'Categories', \
'Categories', 0); +VALUES ('20', 'category', 'Bric::Biz::Category', 'Category', \
'Categories', 'Categories', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (21, 'output_channel', 'Bric::Biz::OutputChannel', 'Output Channel', 'Output \
Channels', 'Output Channel', 0); +VALUES ('21', 'output_channel', \
'Bric::Biz::OutputChannel', 'Output Channel', 'Output Channels', 'Output Channel', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (22, 'element', 'Bric::Biz::AssetType', 'Element', 'Elements', 'Element \
objects', 0); +VALUES ('22', 'element', 'Bric::Biz::AssetType', 'Element', \
'Elements', 'Element objects', '0');  
 /*
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (23, 'category_grp', 'Bric::Util::Grp::Category', 'Hierarchical Category \
Group', 'Hierarchical Category Groups', 'Used to group together categories that have \
a hierarchical relationship to one another.', 0); +VALUES ('23', 'category_grp', \
'Bric::Util::Grp::Category', 'Hierarchical Category Group', 'Hierarchical Category \
Groups', 'Used to group together categories that have a hierarchical relationship to \
                one another.', '0');
 */
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (24, 'asset_type_grp', 'Bric::Util::Grp::AssetType', 'Asset Type Group', \
'Asset Type Groups', 'Asset Type Group', 0); +VALUES ('24', 'asset_type_grp', \
'Bric::Util::Grp::AssetType', 'Asset Type Group', 'Asset Type Groups', 'Asset Type \
Group', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (25, 'asset_version_grp', 'Bric::Util::Grp::AssetVersion', 'Asset Version \
                Group', 
-'Asset Version Groups', 'Asset Version Group', 0);
+VALUES ('25', 'asset_version_grp', 'Bric::Util::Grp::AssetVersion', 'Asset Version \
Group',  +'Asset Version Groups', 'Asset Version Group', '0');
 
 --INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
---VALUES (26, 'asset_language_grp', 'Bric::Util::Grp::AssetLanguage', 'Asset \
                Language Group',
---'Asset Language Groups', 'Asset Language Group', 0);
+--VALUES ('26', 'asset_language_grp', 'Bric::Util::Grp::AssetLanguage', 'Asset \
Language Group', +--'Asset Language Groups', 'Asset Language Group', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (28, 'keyword_grp', 'Bric::Util::Grp::Keyword', 'Keyword Group', 'Keyword \
Groups', 'Keyword group', 0); +VALUES ('28', 'keyword_grp', \
'Bric::Util::Grp::Keyword', 'Keyword Group', 'Keyword Groups', 'Keyword group', '0'); \
  INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (29, 'element_data', 'Bric::Biz::AssetType::Parts::Data', 'Field', 'Fields', \
'Fields', 0); +VALUES ('29', 'element_data', 'Bric::Biz::AssetType::Parts::Data', \
'Field', 'Fields', 'Fields', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (30, 'alert_type', 'Bric::Util::AlertType', 'Alert Type', 'Alert Types', \
'Alert type', 0); +VALUES ('30', 'alert_type', 'Bric::Util::AlertType', 'Alert Type', \
'Alert Types', 'Alert type', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (31, 'alert_type_rule', 'Bric::Util::AlertType::Parts::Rule', 'Alert Type \
Rule', 'Alert Type Rules', 'Alert Type rule', 0); +VALUES ('31', 'alert_type_rule', \
'Bric::Util::AlertType::Parts::Rule', 'Alert Type Rule', 'Alert Type Rules', 'Alert \
Type rule', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (32, 'alert', 'Bric::Util::Alert', 'Alert', 'Alerts', 'Alert', 0);
+VALUES ('32', 'alert', 'Bric::Util::Alert', 'Alert', 'Alerts', 'Alert', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (33, 'recip', 'Bric::Util::Alerted', 'Recipient', 'Recipients', 'Alert \
recipients', 0); +VALUES ('33', 'recip', 'Bric::Util::Alerted', 'Recipient', \
'Recipients', 'Alert recipients', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (34, 'recip_sent', 'Bric::Util::Alerted::Parts::Sent', 'Sent Alert', 'Sent \
Alerts', 'Sent Alert', 0); +VALUES ('34', 'recip_sent', \
'Bric::Util::Alerted::Parts::Sent', 'Sent Alert', 'Sent Alerts', 'Sent Alert', '0');  \
  INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (35, 'source', 'Bric::Biz::Org::Source', 'Source', 'Sources', 'Source \
objects', 0); +VALUES ('35', 'source', 'Bric::Biz::Org::Source', 'Source', 'Sources', \
'Source objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (36, 'source_grp', 'Bric::Util::Grp::Source', 'Source Group', 'Source \
Groups', 'Source group objects', 0); +VALUES ('36', 'source_grp', \
'Bric::Util::Grp::Source', 'Source Group', 'Source Groups', 'Source group objects', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (37, 'element_type', 'Bric::Biz::ATType', 'Element Type', 'Element Types', \
'Element Type objects', 0); +VALUES ('37', 'element_type', 'Bric::Biz::ATType', \
'Element Type', 'Element Types', 'Element Type objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (38, 'grp_member', 'Bric::Util::Grp::Parts::Member', 'Group Member', 'Group \
Members', 'Members of a group', 0); +VALUES ('38', 'grp_member', \
'Bric::Util::Grp::Parts::Member', 'Group Member', 'Group Members', 'Members of a \
group', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (39, 'contrib', 'Bric::Util::Grp::Parts::Member::Contrib', 'Contributor', \
'Contributors', 'Contributors', 0); +VALUES ('39', 'contrib', \
'Bric::Util::Grp::Parts::Member::Contrib', 'Contributor', 'Contributors', \
'Contributors', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (40, 'desk_grp', 'Bric::Util::Grp::Desk', 'Desk Group', 'Desk Groups', 'Desk \
Group', 0); +VALUES ('40', 'desk_grp', 'Bric::Util::Grp::Desk', 'Desk Group', 'Desk \
Groups', 'Desk Group', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (41, 'keyword', 'Bric::Biz::Keyword', 'Keyword', 'Keywords', 'Keyword', 0);
+VALUES ('41', 'keyword', 'Bric::Biz::Keyword', 'Keyword', 'Keywords', 'Keyword', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (42, 'contact', 'Bric::Biz::Contact', 'Contact', 'Contacts', 'Contact \
objects', 0); +VALUES ('42', 'contact', 'Bric::Biz::Contact', 'Contact', 'Contacts', \
'Contact objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (43, 'asset_grp', 'Bric::Util::Grp::Asset', 'Asset Group', 'Asset Groups', 'A \
group of asset objects.', 0); +VALUES ('43', 'asset_grp', 'Bric::Util::Grp::Asset', \
'Asset Group', 'Asset Groups', 'A group of asset objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (44, 'workflow', 'Bric::Biz::Workflow', 'Workflow', 'Workflows', 'Workflow \
objects.', 0); +VALUES ('44', 'workflow', 'Bric::Biz::Workflow', 'Workflow', \
'Workflows', 'Workflow objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (45, 'desk', 'Bric::Biz::Workflow::Parts::Desk', 'Desk', 'Desks', 'Desk \
objects.', 0); +VALUES ('45', 'desk', 'Bric::Biz::Workflow::Parts::Desk', 'Desk', \
'Desks', 'Desk objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (46, 'media', 'Bric::Biz::Asset::Business::Media', 'Media', 'Media', 'Media \
objects.', 0); +VALUES ('46', 'media', 'Bric::Biz::Asset::Business::Media', 'Media', \
'Media', 'Media objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (47, 'category_set', 'Bric::Util::Grp::CategorySet', 'Category Group', \
'Category Groups', 'A group of related categories', 0); +VALUES ('47', \
'category_set', 'Bric::Util::Grp::CategorySet', 'Category Group', 'Category Groups', \
'A group of related categories', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (48, 'pref', 'Bric::Util::Pref', 'Preference', 'Preferences', 'Preference \
objects.', 0); +VALUES ('48', 'pref', 'Bric::Util::Pref', 'Preference', \
'Preferences', 'Preference objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (49, 'audio', 'Bric::Biz::Asset::Business::Media::Audio', 'Audio',  'Audio', \
'Audio Files', 0); +VALUES ('49', 'audio', \
'Bric::Biz::Asset::Business::Media::Audio', 'Audio',  'Audio', 'Audio Files', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (50, 'image', 'Bric::Biz::Asset::Business::Media::Image', 'Image',  'Images', \
'Images', 0); +VALUES ('50', 'image', 'Bric::Biz::Asset::Business::Media::Image', \
'Image',  'Images', 'Images', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (51, 'video', 'Bric::Biz::Asset::Business::Media::Video', 'Video',
-'Videos', 'Videos', 0);
+VALUES ('51', 'video', 'Bric::Biz::Asset::Business::Media::Video', 'Video',
+'Videos', 'Videos', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (52, 'dest', 'Bric::Dist::ServerType', 'Destination', 'Destinations', \
'Distribution destination profile objects.', 0); +VALUES ('52', 'dest', \
'Bric::Dist::ServerType', 'Destination', 'Destinations', 'Distribution destination \
profile objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (53, 'server', 'Bric::Dist::Server', 'Server', 'Servers', 'Server objects.', \
0); +VALUES ('53', 'server', 'Bric::Dist::Server', 'Server', 'Servers', 'Server \
objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (54, 'job', 'Bric::Util::Job', 'Job', 'Jobs', 'Distribution job objects.', \
0); +VALUES ('54', 'job', 'Bric::Util::Job', 'Job', 'Jobs', 'Distribution job \
objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (55, 'resource', 'Bric::Dist::Resource', 'Resource', 'Resources', \
'Distribution resource objects.', 0); +VALUES ('55', 'resource', \
'Bric::Dist::Resource', 'Resource', 'Resources', 'Distribution resource objects.', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (56, 'action_type', 'Bric::Dist::ActionType', 'Action Type', 'Action Types', \
'Distribution action type objects.', 0); +VALUES ('56', 'action_type', \
'Bric::Dist::ActionType', 'Action Type', 'Action Types', 'Distribution action type \
objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (57, 'biz', 'Bric::Biz::Asset::Business', 'Business Asset', 'Business \
Assets', 'Business Asset objects', 0); +VALUES ('57', 'biz', \
'Bric::Biz::Asset::Business', 'Business Asset', 'Business Assets', 'Business Asset \
objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (58, 'pref_grp', 'Bric::Util::Grp::Pref', 'Preference Group', 'Preference \
Groups', 'Group of preferences', 0); +VALUES ('58', 'pref_grp', \
'Bric::Util::Grp::Pref', 'Preference Group', 'Preference Groups', 'Group of \
preferences', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (59, 'output_channel_grp', 'Bric::Util::Grp::OutputChannel', 'Output Channel \
Group', 'Output Channel Groups', 'Group of output channels', 0); +VALUES ('59', \
'output_channel_grp', 'Bric::Util::Grp::OutputChannel', 'Output Channel Group', \
'Output Channel Groups', 'Group of output channels', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (60, 'contrib_type_grp', 'Bric::Util::Grp::ContribType', 'Contributor Type \
Group', 'Contributor Type Groups', 'Group of contributor types', 0); +VALUES ('60', \
'contrib_type_grp', 'Bric::Util::Grp::ContribType', 'Contributor Type Group', \
'Contributor Type Groups', 'Group of contributor types', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (61, 'workflow_grp', 'Bric::Util::Grp::Workflow', 'Workflow Group', 'Workflow \
Groups', 'Group of workflows', 0); +VALUES ('61', 'workflow_grp', \
'Bric::Util::Grp::Workflow', 'Workflow Group', 'Workflow Groups', 'Group of \
workflows', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (62, 'dest_grp', 'Bric::Util::Grp::Dest', 'Destination Group', 'Destination \
Groups', 'Group of destinatinos', 0); +VALUES ('62', 'dest_grp', \
'Bric::Util::Grp::Dest', 'Destination Group', 'Destination Groups', 'Group of \
destinatinos', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (63, 'job_grp', 'Bric::Util::Grp::Job', 'Job Group', 'Job Groups', 'Group of \
jobs', 0); +VALUES ('63', 'job_grp', 'Bric::Util::Grp::Job', 'Job Group', 'Job \
Groups', 'Group of jobs', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (64, 'element_type_grp', 'Bric::Util::Grp::ElementType', 'Element Type \
Group', 'Element Type Groups', 'Group of element types', 0); +VALUES ('64', \
'element_type_grp', 'Bric::Util::Grp::ElementType', 'Element Type Group', 'Element \
Type Groups', 'Group of element types', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (65, 'story_grp', 'Bric::Util::Grp::Story', 'Story Group', 'Story Groups', \
'Group of stories', 0); +VALUES ('65', 'story_grp', 'Bric::Util::Grp::Story', 'Story \
Group', 'Story Groups', 'Group of stories', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (66, 'media_grp', 'Bric::Util::Grp::Media', 'Media Group', 'Media Groups', \
'Group of media', 0); +VALUES ('66', 'media_grp', 'Bric::Util::Grp::Media', 'Media \
Group', 'Media Groups', 'Group of media', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (67, 'formatting_grp', 'Bric::Util::Grp::Formatting', 'Template Group', \
'Template Groups', 'Group of templates', 0); +VALUES ('67', 'formatting_grp', \
'Bric::Util::Grp::Formatting', 'Template Group', 'Template Groups', 'Group of \
templates', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (68, 'grp_grp', 'Bric::Util::Grp::Grp', 'Group Group', 'Group Groups', 'Group \
of groups', 0); +VALUES ('68', 'grp_grp', 'Bric::Util::Grp::Grp', 'Group Group', \
'Group Groups', 'Group of groups', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (69, 'asset', 'Bric::Biz::Asset', 'Asset', 'Assets', 'Asset objects', 0);
+VALUES ('69', 'asset', 'Bric::Biz::Asset', 'Asset', 'Assets', 'Asset objects', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (70, 'element_grp', 'Bric::Util::Grp::Element', 'Element Group', 'Element \
Groups', 'Element group objects', 0); +VALUES ('70', 'element_grp', \
'Bric::Util::Grp::Element', 'Element Group', 'Element Groups', 'Element group \
objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (71, 'perm', 'Bric::Util::Priv', 'Permission', 'Permissions', 'Permission \
objects', 0); +VALUES ('71', 'perm', 'Bric::Util::Priv', 'Permission', 'Permissions', \
'Permission objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (72, 'media_type', 'Bric::Util::MediaType', 'Media Type', 'Media Types', \
'Media Type objects', 0); +VALUES ('72', 'media_type', 'Bric::Util::MediaType', \
'Media Type', 'Media Types', 'Media Type objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (73, 'sftp', 'Bric::Util::Trans::SFTP', 'SFTP', 'SFTP Transport', 'Class with \
methods to move files via SFTP.', 1); +VALUES ('73', 'sftp', \
'Bric::Util::Trans::SFTP', 'SFTP', 'SFTP Transport', 'Class with methods to move \
files via SFTP.', '1');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (74, 'webdav', 'Bric::Util::Trans::WebDAV', 'WebDAV', 'WebDAV Transport', \
'Class with methods to move files via WebDAV', 1); +VALUES ('74', 'webdav', \
'Bric::Util::Trans::WebDAV', 'WebDAV', 'WebDAV Transport', 'Class with methods to \
move files via WebDAV', '1');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (75, 'site', 'Bric::Biz::Site', 'Site', 'Sites', 'Site class', 0);
+VALUES ('75', 'site', 'Bric::Biz::Site', 'Site', 'Sites', 'Site class', '0');
 
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (76, 'site_grp', 'Bric::Util::Grp::Site', 'Site Group','Site Groups', 'Group \
of sites', 0); +VALUES ('76', 'site_grp', 'Bric::Util::Grp::Site', 'Site Group','Site \
Groups', 'Group of sites', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (77, 'media_type_grp', 'Bric::Util::Grp::MediaType', 'Media Type Group', \
'Media Type Groups', 'Media type group objects', 0); +VALUES ('77', 'media_type_grp', \
'Bric::Util::Grp::MediaType', 'Media Type Group', 'Media Type Groups', 'Media type \
group objects', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (78, 'user_pref', 'Bric::Util::UserPref', 'User Preference', 'User \
Preferences', 'User preferences', 0); +VALUES ('78', 'user_pref', \
'Bric::Util::UserPref', 'User Preference', 'User Preferences', 'User preferences', \
'0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (79, 'dist_job', 'Bric::Util::Job::Dist', 'Distribution Job', 'Distribution \
Jobs', 'Distribution job objects.', 0); +VALUES ('79', 'dist_job', \
'Bric::Util::Job::Dist', 'Distribution Job', 'Distribution Jobs', 'Distribution job \
objects.', '0');  
 INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name, description, \
                distributor)
-VALUES (80, 'pub_job', 'Bric::Util::Job::Pub', 'Publication Job', 'Publication \
Jobs', 'Publication job objects.', 0); +VALUES ('80', 'pub_job', \
'Bric::Util::Job::Pub', 'Publication Job', 'Publication Jobs', 'Publication job \
objects.', '0');  

Modified: bricolage/trunk/sql/Pg/Bric/Util/Event.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Event.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Event.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -19,11 +19,11 @@
 --
 
 CREATE TABLE event (
-    id                NUMERIC(10, 0)    NOT NULL
+    id                INTEGER           NOT NULL
                                         DEFAULT NEXTVAL('seq_attr_person'),
-    event_type__id    NUMERIC(10, 0)    NOT NULL,
-    usr__id           NUMERIC(10, 0)    NOT NULL,
-    obj_id            NUMERIC(10, 0)    NOT NULL,
+    event_type__id    INTEGER           NOT NULL,
+    usr__id           INTEGER           NOT NULL,
+    obj_id            INTEGER           NOT NULL,
     timestamp         TIMESTAMP         NOT NULL
                                         DEFAULT CURRENT_TIMESTAMP,
     CONSTRAINT pk_event__id PRIMARY KEY (id)
@@ -33,8 +33,8 @@
 -- TABLE: event_attr
 --
 CREATE TABLE event_attr (
-    event__id            NUMERIC(10, 0)   NOT NULL,
-    event_type_attr__id  NUMERIC(10, 0)   NOT NULL,
+    event__id            INTEGER          NOT NULL,
+    event_type_attr__id  INTEGER          NOT NULL,
     value                VARCHAR(128)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/EventType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/EventType.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/EventType.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -22,15 +22,13 @@
 --
 
 CREATE TABLE event_type (
-    id              NUMERIC(10,0)   NOT NULL
+    id              INTEGER         NOT NULL
                                     DEFAULT NEXTVAL('seq_event_type'),
     key_name        VARCHAR(64)     NOT NULL,
     name            VARCHAR(64)     NOT NULL,
     description     VARCHAR(256)    NOT NULL,
-    class__id       NUMERIC(10,0)   NOT NULL,
-    active          NUMERIC(1, 0)   NOT NULL 
-                                    CONSTRAINT ck_event_type__active CHECK (active \
                IN (1,0))
-                                    DEFAULT 1,
+    class__id       INTEGER         NOT NULL,
+    active          BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_event_type__id PRIMARY KEY (id)
 );
 
@@ -39,9 +37,9 @@
 --
 
 CREATE TABLE event_type_attr (
-    id              NUMERIC(10, 0)  NOT NULL
+    id              INTEGER         NOT NULL
                                     DEFAULT NEXTVAL('seq_event_type_attr'),
-    event_type__id  NUMERIC(10, 0)  NOT NULL,
+    event_type__id  INTEGER         NOT NULL,
     name            VARCHAR(64)     NOT NULL,
     CONSTRAINT pk_event_type_attr__id PRIMARY KEY (id)
 );    

Modified: bricolage/trunk/sql/Pg/Bric/Util/EventType.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/EventType.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/EventType.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -9,47 +9,47 @@
 -- ********** 'formatting_deploy' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_deploy', 'Template Deployed', \
'Template was deployed.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_deploy', 'Template Deployed', 'Template was deployed.', '19', '1');  
 -- ********** 'formatting_redeploy' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_redeploy', 'Template Redeployed', \
'Template was Redeployed.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_redeploy', 'Template Redeployed', 'Template was Redeployed.', '19', '1'); \
                
 -- ********** 'story_publish' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_publish', 'Story Published', 'Story \
was published.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_publish', \
'Story Published', 'Story was published.', '10', '1');  
 -- ********** 'story_republish' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_republish', 'Story Republished', \
'Story was republished.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'story_republish', 'Story Republished', 'Story was republished.', '10', '1');  
 -- ********** 'story_clone' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_clone', 'Story Cloned', 'Story was \
cloned.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_clone', 'Story \
Cloned', 'Story was cloned.', '10', '1');  
 -- ********** 'story_clone_create' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_clone_create', 'Story Created as \
Clone', 'Story was created by cloning.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_clone_create', 'Story Created as Clone', 'Story \
was created by cloning.', '10', '1');  
 -- ********** 'media_publish' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_publish', 'Media Published', 'Media \
was published.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_publish', \
'Media Published', 'Media was published.', '46', '1');  
 -- ********** 'media_republish' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_republish', 'Media Republished', \
'Media was republished.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'media_republish', 'Media Republished', 'Media was republished.', '46', '1');  
 -- ********** 'formatting_checkin' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_checkin', 'Template Checked In', \
'Template was checked in.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_checkin', 'Template Checked In', 'Template was checked in.', '19', '1');  \
  INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Version');
@@ -57,7 +57,7 @@
 -- ********** 'story_checkin' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_checkin', 'Story Checked In', 'Story \
was checked in.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_checkin', \
'Story Checked In', 'Story was checked in.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Version');
@@ -65,7 +65,7 @@
 -- ********** 'media_checkin' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_checkin', 'Media Checked In', 'Media \
was checked in.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_checkin', \
'Media Checked In', 'Media was checked in.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Version');
@@ -73,7 +73,7 @@
 -- ********** 'story_add_contrib' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_add_contrib', 'Contributor Added to \
Story', 'A contributor was associated with the story.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_add_contrib', 'Contributor Added to Story', 'A \
contributor was associated with the story.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
@@ -81,7 +81,7 @@
 -- ********** 'story_del_contrib' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_del_contrib', 'Contributor Removed \
from Story', 'A contributor was dissociated from the story.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_del_contrib', 'Contributor Removed from Story', 'A \
contributor was dissociated from the story.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
@@ -89,7 +89,7 @@
 -- ********** 'media_add_contrib' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_add_contrib', 'Contributor Added to \
Media', 'A contributor was associated with the media.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_add_contrib', 'Contributor Added to Media', 'A \
contributor was associated with the media.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
@@ -97,7 +97,7 @@
 -- ********** 'media_del_contrib' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_del_contrib', 'Contributor Removed \
from Media', 'A contributor was dissociated from the media.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_del_contrib', 'Contributor Removed from Media', 'A \
contributor was dissociated from the media.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
@@ -105,12 +105,12 @@
 -- ********** 'media_upload' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_upload', 'Media File Uploaded', 'Media \
file was uploaded.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_upload', \
'Media File Uploaded', 'Media file was uploaded.', '46', '1');  
 -- ********** 'story_add_category' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_add_category', 'Category Added to \
Story', 'A category was associated with the story.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_add_category', 'Category Added to Story', 'A \
category was associated with the story.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Category');
@@ -118,7 +118,7 @@
 -- ********** 'story_del_category' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_del_category', 'Category Removed from \
Story', 'A category was dissociated from the story.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_del_category', 'Category Removed from Story', 'A \
category was dissociated from the story.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Category');
@@ -127,7 +127,7 @@
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
     VALUES (NEXTVAL('seq_event_type'), 'story_add_oc', 'Output Channel Added to \
                Story',
-                    'An output channel was associated with the story.', 10, 1);
+                    'An output channel was associated with the story.', '10', '1');
 
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Output \
Channel'); @@ -136,7 +136,7 @@
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
     VALUES (NEXTVAL('seq_event_type'), 'story_del_oc', 'Output Channel Removed from \
                Story',
-            'An output channel was dissociated from the story.', 10, 1);
+            'An output channel was dissociated from the story.', '10', '1');
 
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Output \
Channel'); @@ -145,7 +145,7 @@
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
     VALUES (NEXTVAL('seq_event_type'), 'media_add_oc', 'Output Channel Added to \
                Media',
-                    'An output channel was associated with the media.', 46, 1);
+                    'An output channel was associated with the media.', '46', '1');
 
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Output \
Channel'); @@ -154,7 +154,7 @@
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
     VALUES (NEXTVAL('seq_event_type'), 'media_del_oc', 'Output Channel Removed from \
                Media',
-            'An output channel was dissociated from the media.', 46, 1);
+            'An output channel was dissociated from the media.', '46', '1');
 
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Output \
Channel'); @@ -162,7 +162,7 @@
 -- ********** 'story_moved' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_moved', 'Story Moved to Desk', 'Story \
moved onto a desk.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_moved', \
'Story Moved to Desk', 'Story moved onto a desk.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Desk');
@@ -170,7 +170,7 @@
 -- ********** 'media_moved' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_moved', 'Media Moved to Desk', 'Media \
moved onto a desk.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_moved', \
'Media Moved to Desk', 'Media moved onto a desk.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Desk');
@@ -178,7 +178,7 @@
 -- ********** 'formatting_moved' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_moved', 'Template Moved to Desk', \
'Template moved onto a desk.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_moved', 'Template Moved to Desk', 'Template moved onto a desk.', '19', \
'1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Desk');
@@ -186,7 +186,7 @@
 -- ********** 'story_add_workflow' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_add_workflow', 'Story Moved into \
Workflow', 'Story moved into a workflow.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_add_workflow', 'Story Moved into Workflow', 'Story \
moved into a workflow.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Workflow');
@@ -194,7 +194,7 @@
 -- ********** 'media_add_workflow' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_add_workflow', 'Media Moved into \
Workflow', 'Media moved into a workflow.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_add_workflow', 'Media Moved into Workflow', 'Media \
moved into a workflow.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Workflow');
@@ -202,7 +202,7 @@
 -- ********** 'formatting_add_workflow' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_add_workflow', 'Template Moved \
into Workflow', 'Template moved into a workflow.', 19, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'formatting_add_workflow', 'Template Moved into \
Workflow', 'Template moved into a workflow.', '19', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Workflow');
@@ -210,102 +210,102 @@
 -- ********** 'story_rem_workflow' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_rem_workflow', 'Story Removed from \
Workflow', 'Story removed from a workflow.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_rem_workflow', 'Story Removed from Workflow', \
'Story removed from a workflow.', '10', '1');  
 -- ********** 'media_rem_workflow' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_rem_workflow', 'Media Removed from \
Workflow', 'Media removed from a workflow.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_rem_workflow', 'Media Removed from Workflow', \
'Media removed from a workflow.', '46', '1');  
 -- ********** 'formatting_rem_workflow' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_rem_workflow', 'Template Removed \
from Workflow', 'Template removed from a workflow.', 19, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'formatting_rem_workflow', 'Template Removed from \
Workflow', 'Template removed from a workflow.', '19', '1');  
 -- ********** 'story_checkout' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_checkout', 'Story Checked Out', 'Story \
was checked out.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_checkout', \
'Story Checked Out', 'Story was checked out.', '10', '1');  
 -- ********** 'media_checkout' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_checkout', 'Media Checked Out', 'Media \
was checked out.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_checkout', \
'Media Checked Out', 'Media was checked out.', '46', '1');  
 -- ********** 'formatting_checkout' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_checkout', 'Template Checked \
Out', 'Template was checked out.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_checkout', 'Template Checked Out', 'Template was checked out.', '19', \
'1');  
 -- ********** 'story_cancel_checkout' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_cancel_checkout', 'Story Check Out \
Canceled', 'Story check out was canceled.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_cancel_checkout', 'Story Check Out Canceled', \
'Story check out was canceled.', '10', '1');  
 -- ********** 'media_cancel_checkout' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_cancel_checkout', 'Media Check Out \
Canceled', 'Media check out was canceled.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_cancel_checkout', 'Media Check Out Canceled', \
'Media check out was canceled.', '46', '1');  
 -- ********** 'formatting_cancel_checkout' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_cancel_checkout', 'Template Check \
Out Canceled', 'Template check out was caneled.', 19, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'formatting_cancel_checkout', 'Template Check Out \
Canceled', 'Template check out was caneled.', '19', '1');  
 -- ********** 'story_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_new', 'Story Created', 'Story profile \
was created.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_new', 'Story \
Created', 'Story profile was created.', '10', '1');  
 -- ********** 'story_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_save', 'Story Changes Saved', 'Story \
profile changes were saved.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'story_save', 'Story Changes Saved', 'Story profile changes were saved.', '10', '1'); \
                
 -- ********** 'story_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_deact', 'Story Deactivated', 'Story \
profile was deactivated.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'story_deact', 'Story Deactivated', 'Story profile was deactivated.', '10', '1');  
 -- ********** 'media_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_new', 'Media Created', 'Media profile \
was created.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_new', 'Media \
Created', 'Media profile was created.', '46', '1');  
 -- ********** 'media_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_save', 'Media Changes Saved', 'Media \
profile changes were saved.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'media_save', 'Media Changes Saved', 'Media profile changes were saved.', '46', '1'); \
                
 -- ********** 'media_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_deact', 'Media Deactivated', 'Media \
profile was deactivated.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'media_deact', 'Media Deactivated', 'Media profile was deactivated.', '46', '1');  
 -- ********** 'formatting_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_new', 'Template Created', \
'Template profile was created.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_new', 'Template Created', 'Template profile was created.', '19', '1');  
 -- ********** 'formatting_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_save', 'Template Changes Saved', \
'Template profile changes were saved.', 19, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'formatting_save', 'Template Changes Saved', 'Template \
profile changes were saved.', '19', '1');  
 -- ********** 'formatting_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_deact', 'Template Deactivated', \
'Template profile was deactivated.', 19, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'formatting_deact', 'Template Deactivated', 'Template profile was deactivated.', \
'19', '1');  
 -- ********** 'formatting_edit_code' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'formatting_edit_code', 'Template Code \
Edited', 'Template profile code was edited.', 19, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'formatting_edit_code', 'Template Code Edited', 'Template \
profile code was edited.', '19', '1');  
 -- ********** 'story_add_element' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_add_element', 'Element Added to \
Story', 'An element was added to the story.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_add_element', 'Element Added to Story', 'An \
element was added to the story.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Element');
@@ -313,7 +313,7 @@
 -- ********** 'media_add_element' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_add_element', 'Element Added to \
Media', 'An element was added to the media.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_add_element', 'Element Added to Media', 'An \
element was added to the media.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Element');
@@ -321,7 +321,7 @@
 -- ********** 'story_del_element' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_del_element', 'Element Deleted from \
Story', 'An element was deleted from the story.', 10, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'story_del_element', 'Element Deleted from Story', 'An \
element was deleted from the story.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Element');
@@ -329,7 +329,7 @@
 -- ********** 'media_del_element' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_del_element', 'Element Deleted from \
Media', 'An element was deleted from the media.', 46, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_del_element', 'Element Deleted from Media', 'An \
element was deleted from the media.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Element');
@@ -337,177 +337,177 @@
 -- ********** 'pref_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'pref_save', 'Preference Changes Saved', \
'Preference profile changes were saved.', 48, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'pref_save', 'Preference Changes Saved', 'Preference \
profile changes were saved.', '48', '1');  
 -- ********** 'user_pref_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'user_pref_save', 'User Preference Changes \
Saved', 'User preference profile changes were saved.', 78, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'user_pref_save', 'User Preference Changes Saved', 'User \
preference profile changes were saved.', '78', '1');  
 -- ********** 'user_pref_reset' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'user_pref_reset', 'User Preference Reset', \
'User preference was reset to default.', 78, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'user_pref_reset', 'User Preference Reset', 'User \
preference was reset to default.', '78', '1');  
 -- ********** 'user_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'user_new', 'User Created', 'User profile was \
created.', 2, 1); +    VALUES (NEXTVAL('seq_event_type'), 'user_new', 'User Created', \
'User profile was created.', '2', '1');  
 -- ********** 'user_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'user_save', 'User Changes Saved', 'User \
profile changes were saved.', 2, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'user_save', 'User Changes Saved', 'User profile changes were saved.', '2', '1');  
 -- ********** 'user_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'user_deact', 'User Deactivated', 'User \
profile was deactivated.', 2, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'user_deact', 'User Deactivated', 'User profile was deactivated.', '2', '1');  
 -- ********** 'passwd_chg' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'passwd_chg', 'User Password Changed', 'The \
password was changed.', 2, 1); +    VALUES (NEXTVAL('seq_event_type'), 'passwd_chg', \
'User Password Changed', 'The password was changed.', '2', '1');  
 -- ********** 'grp_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'grp_new', 'Group Created', 'Group profile \
was created.', 6, 1); +    VALUES (NEXTVAL('seq_event_type'), 'grp_new', 'Group \
Created', 'Group profile was created.', '6', '1');  
 -- ********** 'grp_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'grp_save', 'Group Saved', 'Group profile \
changes were saved.', 6, 1); +    VALUES (NEXTVAL('seq_event_type'), 'grp_save', \
'Group Saved', 'Group profile changes were saved.', '6', '1');  
 -- ********** 'grp_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'grp_deact', 'Group Deactivated', 'Group \
profile was deactivated.', 6, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'grp_deact', 'Group Deactivated', 'Group profile was deactivated.', '6', '1');  
 -- ********** 'grp_perm_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'grp_perm_save', 'Group Permissions Changed', \
'The permissions associated with the group were changed.', 6, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'grp_perm_save', 'Group Permissions Changed', 'The \
permissions associated with the group were changed.', '6', '1');  
 -- ********** 'dest_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'dest_new', 'Destination Created', \
'Destination profile was created.', 52, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'dest_new', 'Destination Created', 'Destination profile was created.', '52', '1');  
 -- ********** 'dest_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'dest_save', 'Destination Saved', \
'Destination profile changes were saved.', 52, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'dest_save', 'Destination Saved', 'Destination profile \
changes were saved.', '52', '1');  
 -- ********** 'dest_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'dest_deact', 'Destination Deactivated', \
'Destination profile was deactivated.', 52, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'dest_deact', 'Destination Deactivated', 'Destination \
profile was deactivated.', '52', '1');  
 -- ********** 'server_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'server_new', 'Server Created', 'Server \
profile was created.', 53, 1); +    VALUES (NEXTVAL('seq_event_type'), 'server_new', \
'Server Created', 'Server profile was created.', '53', '1');  
 -- ********** 'server_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'server_save', 'Server Saved', 'Server \
profile changes were saved.', 53, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'server_save', 'Server Saved', 'Server profile changes were saved.', '53', '1');  
 -- ********** 'server_act' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'server_act', 'Server Activated', 'Server \
profile was activated.', 53, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'server_act', 'Server Activated', 'Server profile was activated.', '53', '1');  
 -- ********** 'server_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'server_deact', 'Server Deactivated', 'Server \
profile was deactivated.', 53, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'server_deact', 'Server Deactivated', 'Server profile was deactivated.', '53', '1');  \
                
 -- ********** 'server_del' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'server_del', 'Server Deleted', 'Server \
profile was deleted.', 53, 1); +    VALUES (NEXTVAL('seq_event_type'), 'server_del', \
'Server Deleted', 'Server profile was deleted.', '53', '1');  
 -- ********** 'action_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'action_new', 'Action Created', 'Action \
profile was created.', 14, 1); +    VALUES (NEXTVAL('seq_event_type'), 'action_new', \
'Action Created', 'Action profile was created.', '14', '1');  
 -- ********** 'action_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'action_save', 'Action Saved', 'Action \
profile changes were saved.', 14, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'action_save', 'Action Saved', 'Action profile changes were saved.', '14', '1');  
 -- ********** 'action_act' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'action_act', 'Action Activated', 'Action \
profile was activated.', 14, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'action_act', 'Action Activated', 'Action profile was activated.', '14', '1');  
 -- ********** 'action_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'action_deact', 'Action Deactivated', 'Action \
profile was deactivated.', 14, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'action_deact', 'Action Deactivated', 'Action profile was deactivated.', '14', '1');  \
                
 -- ********** 'action_del' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'action_del', 'Action Deleted', 'Action \
profile was deleted.', 14, 1); +    VALUES (NEXTVAL('seq_event_type'), 'action_del', \
'Action Deleted', 'Action profile was deleted.', '14', '1');  
 -- ********** 'output_channel_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'output_channel_new', 'Output Channel \
Created', 'Output Channel profile was created.', 21, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'output_channel_new', 'Output Channel Created', 'Output \
Channel profile was created.', '21', '1');  
 -- ********** 'output_channel_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'output_channel_save', 'Output Channel \
Changes Saved', 'Output Channel profile changes were saved.', 21, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'output_channel_save', 'Output Channel Changes Saved', \
'Output Channel profile changes were saved.', '21', '1');  
 -- ********** 'output_channel_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'output_channel_deact', 'Output Channel \
Deactivated', 'Output Channel profile was deactivated.', 21, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'output_channel_deact', 'Output Channel Deactivated', \
'Output Channel profile was deactivated.', '21', '1');  
 -- ********** 'contrib_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_new', 'Contributor Created', \
'Contributor profile was created.', 39, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'contrib_new', 'Contributor Created', 'Contributor profile was created.', '39', '1'); \
                
 -- ********** 'contrib_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_save', 'Contributor Changes Saved', \
'Contributor profile changes were saved.', 39, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'contrib_save', 'Contributor Changes Saved', 'Contributor \
profile changes were saved.', '39', '1');  
 -- ********** 'contrib_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_deact', 'Contributor Deactivated', \
'Contributor profile was deactivated.', 39, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'contrib_deact', 'Contributor Deactivated', 'Contributor \
profile was deactivated.', '39', '1');  
 -- ********** 'contrib_ext' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_ext', 'Contributor Forked', \
'Contributor profile was forked to become a new contributor profile.', 39, 1); +    \
VALUES (NEXTVAL('seq_event_type'), 'contrib_ext', 'Contributor Forked', 'Contributor \
profile was forked to become a new contributor profile.', '39', '1');  
 -- ********** 'contrib_type_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_type_new', 'Contributor Type \
Created', 'Contributor Type profile was created.', 9, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'contrib_type_new', 'Contributor Type Created', \
'Contributor Type profile was created.', '9', '1');  
 -- ********** 'contrib_type_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_type_save', 'Contributor Type \
Changes Saved', 'Contributor Type profile changes were saved.', 9, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'contrib_type_save', 'Contributor Type Changes Saved', \
'Contributor Type profile changes were saved.', '9', '1');  
 -- ********** 'contrib_type_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_type_deact', 'Contributor Type \
Deactivated', 'Contributor Type profile was deactivated.', 9, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'contrib_type_deact', 'Contributor Type Deactivated', \
'Contributor Type profile was deactivated.', '9', '1');  
 -- ********** 'contrib_type_ext' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_type_ext', 'Contributor Type Field \
Added', 'A new field was added to the Contributor Type profile.', 9, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'contrib_type_ext', 'Contributor Type Field Added', 'A \
new field was added to the Contributor Type profile.', '9', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
@@ -515,7 +515,7 @@
 -- ********** 'contrib_type_unext' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'contrib_type_unext', 'Contributor Type Field \
Deleted', 'A field was deleted from the Contributor Type profile.', 9, 1); +    \
VALUES (NEXTVAL('seq_event_type'), 'contrib_type_unext', 'Contributor Type Field \
Deleted', 'A field was deleted from the Contributor Type profile.', '9', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
@@ -523,22 +523,22 @@
 -- ********** 'workflow_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'workflow_new', 'Workflow Created', 'Workflow \
profile was created.', 44, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'workflow_new', 'Workflow Created', 'Workflow profile was created.', '44', '1');  
 -- ********** 'workflow_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'workflow_save', 'Workflow Changes Saved', \
'Workflow profile changes were saved.', 44, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'workflow_save', 'Workflow Changes Saved', 'Workflow \
profile changes were saved.', '44', '1');  
 -- ********** 'workflow_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'workflow_deact', 'Workflow Deactivated', \
'Workflow profile was deactivated.', 44, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'workflow_deact', 'Workflow Deactivated', 'Workflow profile was deactivated.', '44', \
'1');  
 -- ********** 'workflow_add_desk' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'workflow_add_desk', 'Desk Added to \
Workflow', 'A desk was added to the workflow profile.', 44, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'workflow_add_desk', 'Desk Added to Workflow', 'A desk \
was added to the workflow profile.', '44', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Desk');
@@ -546,7 +546,7 @@
 -- ********** 'workflow_del_desk' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'workflow_del_desk', 'Desk Removed from \
Workflow', 'A desk was removed from the workflow profile.', 44, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'workflow_del_desk', 'Desk Removed from Workflow', 'A \
desk was removed from the workflow profile.', '44', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Desk');
@@ -554,145 +554,145 @@
 -- ********** 'desk_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'desk_new', 'Desk Created', 'Desk profile was \
created.', 45, 1); +    VALUES (NEXTVAL('seq_event_type'), 'desk_new', 'Desk \
Created', 'Desk profile was created.', '45', '1');  
 -- ********** 'desk_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'desk_save', 'Desk Changes Saved', 'Desk \
profile changes were saved.', 45, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'desk_save', 'Desk Changes Saved', 'Desk profile changes were saved.', '45', '1');  
 -- ********** 'desk_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'desk_deact', 'Desk Deactivated', 'Desk \
profile was deactivated.', 45, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'desk_deact', 'Desk Deactivated', 'Desk profile was deactivated.', '45', '1');  
 -- ********** 'category_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'category_new', 'Category Created', 'Category \
profile was created.', 20, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'category_new', 'Category Created', 'Category profile was created.', '20', '1');  
 -- ********** 'category_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'category_save', 'Category Changes Saved', \
'Category profile changes were saved.', 20, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'category_save', 'Category Changes Saved', 'Category \
profile changes were saved.', '20', '1');  
 -- ********** 'category_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'category_deact', 'Category Deactivated', \
'Category profile was deactivated.', 20, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'category_deact', 'Category Deactivated', 'Category profile was deactivated.', '20', \
'1');  
 -- ********** 'category_deact_cascade' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'category_deact_cascade', 'Category and \
Subcategories Deactivated', 'Category profile and all its subcategory profiles were \
deactivated.', 20, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'category_deact_cascade', 'Category and Subcategories Deactivated', 'Category profile \
and all its subcategory profiles were deactivated.', '20', '1');  
 -- ********** 'source_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'source_new', 'Source Created', 'Source \
profile was created.', 35, 1); +    VALUES (NEXTVAL('seq_event_type'), 'source_new', \
'Source Created', 'Source profile was created.', '35', '1');  
 -- ********** 'source_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'source_save', 'Source Changes Saved', \
'Source profile changes were saved.', 35, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'source_save', 'Source Changes Saved', 'Source profile changes were saved.', '35', \
'1');  
 -- ********** 'source_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'source_deact', 'Source Deactivated', 'Source \
profile was deactivated.', 35, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'source_deact', 'Source Deactivated', 'Source profile was deactivated.', '35', '1');  \
                
 -- ********** 'org_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'org_new', 'Organization Created', \
'Organization profile was created.', 3, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'org_new', 'Organization Created', 'Organization profile was created.', '3', '1');  
 -- ********** 'org_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'org_save', 'Organization Changes Saved', \
'Organization profile changes were saved.', 3, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'org_save', 'Organization Changes Saved', 'Organization \
profile changes were saved.', '3', '1');  
 -- ********** 'org_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'org_deact', 'Organization Deactivated', \
'Organization profile was deactivated.', 3, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'org_deact', 'Organization Deactivated', 'Organization \
profile was deactivated.', '3', '1');  
 -- ********** 'element_new' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_new', 'Element Created', 'Element \
profile was created.', 22, 1); +    VALUES (NEXTVAL('seq_event_type'), 'element_new', \
'Element Created', 'Element profile was created.', '22', '1');  
 -- ********** 'element_save' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_save', 'Element Changes Saved', \
'Element profile changes were saved.', 22, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'element_save', 'Element Changes Saved', 'Element profile \
changes were saved.', '22', '1');  
 -- ********** 'element_deact' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_deact', 'Element Deactivated', \
'Element profile was deactivated.', 22, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'element_deact', 'Element Deactivated', 'Element profile was deactivated.', '22', \
'1');  
 -- ********** 'element_attr_add' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_attr_add', 'Field Added to Element', \
'A field was added to the element profile.', 22, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'element_attr_add', 'Field Added to Element', 'A field \
was added to the element profile.', '22', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
 
 -- ********** 'element_attr_del' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_attr_del', 'Field Deleted from \
Element', 'A field was deleted from the element profile.', 22, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'element_attr_del', 'Field Deleted from Element', 'A \
field was deleted from the element profile.', '22', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Name');
 
 -- ********** 'element_data_new' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_data_new', 'Element Data Created', \
'Element Data was created.', 29, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'element_data_new', 'Element Data Created', 'Element Data was created.', '29', '1');  \
                
 -- ********** 'element_data_save' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_data_save', 'Element Data Saved in \
Element', 'Element Data was saved in the element data profile.', 29, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'element_data_save', 'Element Data Saved in Element', \
'Element Data was saved in the element data profile.', '29', '1');  
 -- ********** 'element_data_del' ************ --
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_data_del', 'Element Data Deleted \
from Element', 'Element Data was deleted from the element data profile.', 29, 1); +   \
VALUES (NEXTVAL('seq_event_type'), 'element_data_del', 'Element Data Deleted from \
Element', 'Element Data was deleted from the element data profile.', '29', '1');  
 -- ********** 'element_type_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_type_new', 'Element Type Created', \
'Element Type profile was created.', 37, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'element_type_new', 'Element Type Created', 'Element Type profile was created.', \
'37', '1');  
 -- ********** 'element_type_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_type_save', 'Element Type Changes \
Saved', 'Element Type profile changes were saved.', 37, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'element_type_save', 'Element Type Changes Saved', \
'Element Type profile changes were saved.', '37', '1');  
 -- ********** 'element_type_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'element_type_deact', 'Element Type \
Deactivated', 'Element Type profile was deactivated.', 37, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'element_type_deact', 'Element Type Deactivated', \
'Element Type profile was deactivated.', '37', '1');  
 -- ********** 'job_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'job_new', 'Job Created', 'Job was created.', \
54, 1); +    VALUES (NEXTVAL('seq_event_type'), 'job_new', 'Job Created', 'Job was \
created.', '54', '1');  
 -- ********** 'job_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'job_save', 'Job Changes Saved', 'Job changes \
were saved.', 54, 1); +    VALUES (NEXTVAL('seq_event_type'), 'job_save', 'Job \
Changes Saved', 'Job changes were saved.', '54', '1');  
 -- ********** 'job_cancel' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'job_cancel', 'Job Cancelled', 'Job was \
cancelled.', 54, 1); +    VALUES (NEXTVAL('seq_event_type'), 'job_cancel', 'Job \
Cancelled', 'Job was cancelled.', '54', '1');  
 -- ********** 'job_exec' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'job_exec', 'Job Executed', 'Job was \
executed.', 54, 1); +    VALUES (NEXTVAL('seq_event_type'), 'job_exec', 'Job \
Executed', 'Job was executed.', '54', '1');  
 -- ********** 'resource_action' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'resource_action', 'Action Applied to \
Resource', 'An action was applied to the resource.', 55, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'resource_action', 'Action Applied to Resource', 'An \
action was applied to the resource.', '55', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Action');
@@ -700,7 +700,7 @@
 -- ********** 'resource_undo_action' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'resource_undo_action', 'Action Undone on \
Resource', 'An action was undone on the resource.', 55, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'resource_undo_action', 'Action Undone on Resource', 'An \
action was undone on the resource.', '55', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Action');
@@ -708,17 +708,17 @@
 -- ********** 'resource_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'resource_new', 'Resource Created', 'Resource \
profile was created.', 55, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'resource_new', 'Resource Created', 'Resource profile was created.', '55', '1');  
 -- ********** 'resource_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'resource_save', 'Resource Changes Saved', \
'Resource profile changes were saved.', 55, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'resource_save', 'Resource Changes Saved', 'Resource \
profile changes were saved.', '55', '1');  
 -- ********** 'resource_move' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'resource_move', 'Resource Distributed', \
'Resource was distributed.', 55, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'resource_move', 'Resource Distributed', 'Resource was distributed.', '55', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Via');
@@ -726,7 +726,7 @@
 -- ********** 'resource_remove' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'resource_remove', 'Resource Removed', \
'Resource was removed.', 55, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'resource_remove', 'Resource Removed', 'Resource was removed.', '55', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'Via');
@@ -734,77 +734,77 @@
 -- ********** 'alert_type_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'alert_type_new', 'Alert Type Created', \
'Alert Type was created.', 30, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'alert_type_new', 'Alert Type Created', 'Alert Type was created.', '30', '1');  
 -- ********** 'alert_type_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'alert_type_save', 'Alert Type Saved', 'Alert \
Type profile changes were saved.', 30, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'alert_type_save', 'Alert Type Saved', 'Alert Type profile changes were saved.', \
'30', '1');  
 -- ********** 'alert_type_act' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'alert_type_act', 'Alert Type Activated', \
'Alert Type profile was activated.', 30, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'alert_type_act', 'Alert Type Activated', 'Alert Type profile was activated.', '30', \
'1');  
 -- ********** 'alert_type_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'alert_type_deact', 'Alert Type Deactivated', \
'Alert Type profile was deactivated.', 30, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'alert_type_deact', 'Alert Type Deactivated', 'Alert Type \
profile was deactivated.', '30', '1');  
 -- ********** 'alert_type_del' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'alert_type_del', 'Alert Type Deleted', \
'Alert Type profile was deleted.', 30, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'alert_type_del', 'Alert Type Deleted', 'Alert Type profile was deleted.', '30', \
'1');  
 -- ********** 'media_type_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_type_new', 'Media Type Created', \
'Media Type was created.', 72, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'media_type_new', 'Media Type Created', 'Media Type was created.', '72', '1');  
 -- ********** 'media_type_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_type_save', 'Media Type Saved', 'Media \
Type profile changes were saved.', 72, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'media_type_save', 'Media Type Saved', 'Media Type profile changes were saved.', \
'72', '1');  
 -- ********** 'media_type_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_type_deact', 'Media Type Deactivated', \
'Media Type profile was deactivated.', 72, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'media_type_deact', 'Media Type Deactivated', 'Media Type \
profile was deactivated.', '72', '1');  
 -- ********** 'keyword_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'keyword_new', 'Keyword Created', 'Keyword \
was created.', 41, 1); +    VALUES (NEXTVAL('seq_event_type'), 'keyword_new', \
'Keyword Created', 'Keyword was created.', '41', '1');  
 -- ********** 'keyword_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'keyword_save', 'Keyword Saved', 'Keyword \
profile changes were saved.', 41, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'keyword_save', 'Keyword Saved', 'Keyword profile changes were saved.', '41', '1');  
 -- ********** 'keyword_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'keyword_deact', 'Keyword Deactivated', \
'Keyword was deactivated.', 41, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'keyword_deact', 'Keyword Deactivated', 'Keyword was deactivated.', '41', '1');  
 -- ********** 'site_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'site_new', 'Site Created', 'Site was \
created.', 75, 1); +    VALUES (NEXTVAL('seq_event_type'), 'site_new', 'Site \
Created', 'Site was created.', '75', '1');  
 -- ********** 'site_save' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'site_save', 'Site Saved', 'Site profile \
changes were saved.', 75, 1); +    VALUES (NEXTVAL('seq_event_type'), 'site_save', \
'Site Saved', 'Site profile changes were saved.', '75', '1');  
 -- ********** 'site_deact' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'site_deact', 'Site Deactivated', 'Site was \
deactivated.', 75, 1); +    VALUES (NEXTVAL('seq_event_type'), 'site_deact', 'Site \
Deactivated', 'Site was deactivated.', '75', '1');  
 -- ********** 'story_aliased' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_aliased', 'Story Aliased', 'Story was \
aliased.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), 'story_aliased', 'Story \
Aliased', 'Story was aliased.', '10', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'To Site');
@@ -812,7 +812,7 @@
 -- ********** 'story_alias_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'story_alias_new', 'Story Created as Alias', \
'Story was created as an alias.', 10, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'story_alias_new', 'Story Created as Alias', 'Story was created as an alias.', '10', \
'1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'From Site');
@@ -820,7 +820,7 @@
 -- ********** 'media_aliased' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_aliased', 'Media Aliased', 'Media was \
aliased.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), 'media_aliased', 'Media \
Aliased', 'Media was aliased.', '46', '1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'To Site');
@@ -828,7 +828,7 @@
 -- ********** 'media_alias_new' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'media_alias_new', 'Media Created as Alias', \
'Media was created as an alias.', 46, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'media_alias_new', 'Media Created as Alias', 'Media was created as an alias.', '46', \
'1');  
     INSERT INTO event_type_attr (id, event_type__id, name)
     VALUES (NEXTVAL('seq_event_type_attr'), CURRVAL('seq_event_type'), 'From Site');
@@ -836,12 +836,12 @@
 -- ********** 'dist_job_failed' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'dist_job_failed', 'Distribution job failed', \
'Distribution job failed due to error.', 79, 1); +    VALUES \
(NEXTVAL('seq_event_type'), 'dist_job_failed', 'Distribution job failed', \
'Distribution job failed due to error.', '79', '1');  
 -- ********** 'pub_job_failed' ************ --
 
     INSERT INTO event_type (id, key_name, name, description, class__id, active)
-    VALUES (NEXTVAL('seq_event_type'), 'pub_job_failed', 'Publish job failed', \
'Publish job failed due to error.', 80, 1); +    VALUES (NEXTVAL('seq_event_type'), \
'pub_job_failed', 'Publish job failed', 'Publish job failed due to error.', '80', \
'1');  
 
 /*****************************************************************************
@@ -852,51 +852,51 @@
 -- Create creation events for all default templates.
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (502, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 502, CURRENT_TIMESTAMP);
+VALUES ('502', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '502', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (503, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 503, CURRENT_TIMESTAMP);
+VALUES ('503', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '503', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (504, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 504, CURRENT_TIMESTAMP);
+VALUES ('504', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '504', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (506, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 506, CURRENT_TIMESTAMP);
+VALUES ('506', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '506', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (507, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 507, CURRENT_TIMESTAMP);
+VALUES ('507', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '507', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (509, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 509, CURRENT_TIMESTAMP);
+VALUES ('509', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '509', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (510, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 510, CURRENT_TIMESTAMP);
+VALUES ('510', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '510', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (511, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 511, CURRENT_TIMESTAMP);
+VALUES ('511', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '511', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (512, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 512, CURRENT_TIMESTAMP);
+VALUES ('512', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '512', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (513, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 513, CURRENT_TIMESTAMP);
+VALUES ('513', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '513', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (514, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 514, CURRENT_TIMESTAMP);
+VALUES ('514', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '514', CURRENT_TIMESTAMP);
 
 INSERT INTO event (id, event_type__id, usr__id, obj_id, timestamp)
-VALUES (515, (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
-        0, 515, CURRENT_TIMESTAMP);
+VALUES ('515', (SELECT id FROM event_type WHERE key_name = 'formatting_new'),
+        '0', '515', CURRENT_TIMESTAMP);
 
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/AlertType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/AlertType.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/AlertType.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -11,10 +11,10 @@
 --
 
 CREATE TABLE alert_type_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_alert_type_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_alert_type_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/ContribType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/ContribType.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/ContribType.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -15,10 +15,10 @@
 --
 
 CREATE TABLE contrib_type_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_contrib_type_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_contrib_type_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/Org.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/Org.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/Org.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,10 +11,10 @@
 --
 
 CREATE TABLE org_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_org_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_org_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Grp_Member.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Grp_Member.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Grp_Member.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -35,10 +35,10 @@
 --
 
 CREATE TABLE grp_member (
-    id            NUMERIC(10,0)   NOT NULL
+    id            INTEGER         NOT NULL
                                   DEFAULT NEXTVAL('seq_grp_member'),
-    object_id     NUMERIC(10,0)   NOT NULL,
-    member__id    NUMERIC(10,0)	  NOT NULL,
+    object_id     INTEGER         NOT NULL,
+    member__id    INTEGER      	  NOT NULL,
     CONSTRAINT pk_grp_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member/Contrib.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member/Contrib.val	2004-11-09 02:58:13 \
                UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member/Contrib.val	2004-11-09 03:32:57 \
UTC (rev 6066) @@ -6,40 +6,40 @@
 
 -- Create the 'Bio' attribute.
 INSERT INTO attr_grp (id, subsys, name, sql_type, active)
-VALUES (1, '_MEMBER_SUBSYS', 'Bio', 'blob', 1);
+VALUES ('1', '_MEMBER_SUBSYS', 'Bio', 'blob', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (1, 1, 'maxlength', '0', 1);
+VALUES ('1', '1', 'maxlength', '0', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (2, 1, 'cols', '50', 1);
+VALUES ('2', '1', 'cols', '50', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (3, 1, 'length', '', 1);
+VALUES ('3', '1', 'length', '', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (4, 1, 'multiple', '', 1);
+VALUES ('4', '1', 'multiple', '', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (5, 1, 'vals', '', 1);
+VALUES ('5', '1', 'vals', '', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (6, 1, 'rows', '5', 1);
+VALUES ('6', '1', 'rows', '5', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (7, 1, 'type', 'textarea', 1);
+VALUES ('7', '1', 'type', 'textarea', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (8, 1, 'disp', 'Bio', 1);
+VALUES ('8', '1', 'disp', 'Bio', '1');
 
 INSERT INTO attr_grp_meta (id, attr__id, name, value, active)
-VALUES (9, 1, 'pos', '1', 1);
+VALUES ('9', '1', 'pos', '1', '1');
 
 -- Associate Bio with Writers.
 INSERT INTO attr_grp_val(id, object__id, attr__id, active)
-VALUES (1, 39, 1, 1);
+VALUES ('1', '39', '1', '1');
 
 -- Associate Bio with Illustrators.
 INSERT INTO attr_grp_val(id, object__id, attr__id, active)
-VALUES (2, 40, 1, 1);
+VALUES ('2', '40', '1', '1');
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member.sql	2004-11-09 02:58:13 UTC \
                (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member.sql	2004-11-09 03:32:57 UTC \
(rev 6066) @@ -34,14 +34,11 @@
 --
 
 CREATE TABLE member (
-    id         NUMERIC(10,0)  NOT NULL
+    id         INTEGER        NOT NULL
                               DEFAULT NEXTVAL('seq_member'),
-    grp__id    NUMERIC(10,0)  NOT NULL,
-    class__id  NUMERIC(10,0)  NOT NULL,
-    active     NUMERIC(1,0)   NOT NULL
-                              DEFAULT 1
-                              CONSTRAINT ck_member__active
-                                CHECK (active IN (0,1)),
+    grp__id    INTEGER        NOT NULL,
+    class__id  INTEGER        NOT NULL,
+    active     BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_member__id PRIMARY KEY (id)
 );
 
@@ -61,10 +58,10 @@
 --
 
 CREATE TABLE story_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_story_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_story_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member_Attr.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member_Attr.sql	2004-11-09 02:58:13 \
                UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/Parts/Member_Attr.sql	2004-11-09 03:32:57 \
UTC (rev 6066) @@ -33,13 +33,11 @@
 --              its subsystem, its member ID and an attribute name.
 
 CREATE TABLE attr_member (
-    id         NUMERIC(10)   NOT NULL,
+    id         INTEGER       NOT NULL,
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_member__active CHECK (active IN \
(0,1)), +    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_member__id PRIMARY KEY (id)
 );
 
@@ -48,16 +46,14 @@
 -- Description: A table to hold attribute values.
 
 CREATE TABLE attr_member_val (
-    id           NUMERIC(10)     NOT NULL,
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    id           INTEGER         NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_member_val__active CHECK (active \
IN (0,1)), +    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_member_val__id PRIMARY KEY (id)
 );
 
@@ -66,13 +62,11 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_member_meta (
-    id        NUMERIC(10)     NOT NULL,
-    attr__id  NUMERIC(10)     NOT NULL,
+    id        INTEGER         NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_member_meta__active CHECK (active \
IN (0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_member_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/Source.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/Source.sql	2004-11-09 02:58:13 UTC (rev \
                6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/Source.sql	2004-11-09 03:32:57 UTC (rev \
6066) @@ -11,10 +11,10 @@
 --
 
 CREATE TABLE source_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_source_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_source_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp/User.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp/User.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp/User.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,10 +11,10 @@
 --
 
 CREATE TABLE user_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_user_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_user_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -20,25 +20,16 @@
 --
 
 CREATE TABLE grp (
-    id           NUMERIC(10,0)    NOT NULL
+    id           INTEGER          NOT NULL
                                   DEFAULT NEXTVAL('seq_grp'),
-    parent_id    NUMERIC(10,0)    CONSTRAINT ck_grp__parent_id_not_eq_id
+    parent_id    INTEGER          CONSTRAINT ck_grp__parent_id_not_eq_id
                                     CHECK (parent_id <> id),
-    class__id    NUMERIC(10,0)    NOT NULL,
+    class__id    INTEGER          NOT NULL,
     name         VARCHAR(64),
     description  VARCHAR(256),
-    secret       NUMERIC(1,0)     NOT NULL
-                                  DEFAULT 1
-                                  CONSTRAINT ck_grp__secret
-                                    CHECK (secret IN (0,1)),
-    permanent    NUMERIC(1,0)     NOT NULL
-                                  DEFAULT 0
-                                  CONSTRAINT ck_grp__permanent
-                                    CHECK (permanent IN (0,1)),
-    active      NUMERIC(1,0)      NOT NULL
-                                  DEFAULT 1
-                                  CONSTRAINT ck_grp__active
-                                    CHECK (active IN (0,1)),
+    secret       BOOLEAN          NOT NULL DEFAULT TRUE,
+    permanent    BOOLEAN          NOT NULL DEFAULT FALSE,
+    active       BOOLEAN          NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_grp__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -5,332 +5,332 @@
 -- $LastChangedDate$
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (0, NULL, 6, 'Root Group', 'The mother of all groups.', 1, 1);
+VALUES ('0', NULL, '6', 'Root Group', 'The mother of all groups.', '1', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (112, 35, 6, 1);
+VALUES ('112', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (1, 0, 112); 
+VALUES ('1', '0', '112'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (1, 0, 9, 'All Contributors', 'All contributors in the system.', 0, 1);
+VALUES ('1', '0', '9', 'All Contributors', 'All contributors in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (113, 35, 6, 1);
+VALUES ('113', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (2, 1, 113); 
+VALUES ('2', '1', '113'); 
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (406, 24, 9, 1);
+VALUES ('406', '24', '9', '1');
 
 INSERT INTO contrib_type_member (id, object_id, member__id)
-VALUES (1, 1, 406); 
+VALUES ('1', '1', '406'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (2, 0, 8, 'All Users', 'All users of the system.', 0, 1);
+VALUES ('2', '0', '8', 'All Users', 'All users of the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (114, 35, 6, 1);
+VALUES ('114', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (3, 2, 114); 
+VALUES ('3', '2', '114'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (3, 0, 17, 'All Organizations', 'All organizations in the system.', 0, 1);
+VALUES ('3', '0', '17', 'All Organizations', 'All organizations in the system.', \
'0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (115, 35, 6, 1);
+VALUES ('115', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (4, 3, 115); 
+VALUES ('4', '3', '115'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (4, 0, 18, 'All Alert Types', 'All alert types in the system.', 0, 1);
+VALUES ('4', '0', '18', 'All Alert Types', 'All alert types in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (116, 35, 6, 1);
+VALUES ('116', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (5, 4, 116); 
+VALUES ('5', '4', '116'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (5, 0, 36, 'All Sources', 'All sources in the system.', 0, 1);
+VALUES ('5', '0', '36', 'All Sources', 'All sources in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (117, 35, 6, 1);
+VALUES ('117', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (6, 5, 117); 
+VALUES ('6', '5', '117'); 
 
 -- Hack. Ideally, the 'Global Admins' groups should be permanent, but
 -- there are so many special conditions for this group, that it's simpler at
 -- this point to just check for it's ID to keep it permanent.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (6, NULL, 8, 'Global Admins', 'Users who can do anything.', 0, 0);
+VALUES ('6', NULL, '8', 'Global Admins', 'Users who can do anything.', '0', '0');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (118, 35, 6, 1);
+VALUES ('118', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (7, 6, 118); 
+VALUES ('7', '6', '118'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (7, NULL, 8, 'Story Editors', 'Users who edit stories.', 0, 0);
+VALUES ('7', NULL, '8', 'Story Editors', 'Users who edit stories.', '0', '0');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (119, 35, 6, 1);
+VALUES ('119', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (8, 7, 119); 
+VALUES ('8', '7', '119'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (8, NULL, 8, 'Media Producers', 'Users who produce and edit media.', 0, 0);
+VALUES ('8', NULL, '8', 'Media Producers', 'Users who produce and edit media.', '0', \
'0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (120, 35, 6, 1);
+VALUES ('120', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (9, 8, 120); 
+VALUES ('9', '8', '120'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (9, NULL, 8, 'Template Developers', 'Users who develop templates', 0, 0);
+VALUES ('9', NULL, '8', 'Template Developers', 'Users who develop templates', '0', \
'0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (121, 35, 6, 1);
+VALUES ('121', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (10, 9, 121); 
+VALUES ('10', '9', '121'); 
 
 /*
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (10, NULL, 8, 'Element Admins', 'Users who administer elements and element \
types.', 0, 0); +VALUES ('10', NULL, '8', 'Element Admins', 'Users who administer \
elements and element types.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (122, 35, 6, 1);
+VALUES ('122', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (11, 10, 122); 
+VALUES ('11', '10', '122'); 
 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (11, NULL, 8, 'User Admins', 'Users who administer users.', 0, 0);
+VALUES ('11', NULL, '8', 'User Admins', 'Users who administer users.', '0', '0');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (123, 35, 6, 1);
+VALUES ('123', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (12, 11, 123); 
+VALUES ('12', '11', '123'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (12, NULL, 8, 'Preference Admins', 'Users who administer preferences.', 0, \
0); +VALUES ('12', NULL, '8', 'Preference Admins', 'Users who administer \
preferences.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (124, 35, 6, 1);
+VALUES ('124', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (13, 12, 124); 
+VALUES ('13', '12', '124'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (13, NULL, 8, 'Group Admins', 'Users who administer groups.', 0, 0);
+VALUES ('13', NULL, '8', 'Group Admins', 'Users who administer groups.', '0', '0');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (125, 35, 6, 1);
+VALUES ('125', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (14, 13, 125); 
+VALUES ('14', '13', '125'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (14, NULL, 8, 'Output Channel Admins', 'Users who administer output \
channels.', 0, 0); +VALUES ('14', NULL, '8', 'Output Channel Admins', 'Users who \
administer output channels.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (126, 35, 6, 1);
+VALUES ('126', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (15, 14, 126); 
+VALUES ('15', '14', '126'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (15, NULL, 8, 'Contributor Admins', 'Users who administer contributors and \
contributor types.', 0, 0); +VALUES ('15', NULL, '8', 'Contributor Admins', 'Users \
who administer contributors and contributor types.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (127, 35, 6, 1);
+VALUES ('127', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (16, 15, 127); 
+VALUES ('16', '15', '127'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (16, NULL, 8, 'Workflow Admins', 'Users who administer workflows.', 0, 0);
+VALUES ('16', NULL, '8', 'Workflow Admins', 'Users who administer workflows.', '0', \
'0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (128, 35, 6, 1);
+VALUES ('128', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (17, 16, 128); 
+VALUES ('17', '16', '128'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (17, NULL, 8, 'Category Admins', 'Users who administer categories.', 0, 0);
+VALUES ('17', NULL, '8', 'Category Admins', 'Users who administer categories.', '0', \
'0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (129, 35, 6, 1);
+VALUES ('129', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (18, 17, 129); 
+VALUES ('18', '17', '129'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (18, NULL, 8, 'Source Admins', 'Users who administer sources.', 0, 0);
+VALUES ('18', NULL, '8', 'Source Admins', 'Users who administer sources.', '0', \
'0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (130, 35, 6, 1);
+VALUES ('130', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (19, 18, 130); 
+VALUES ('19', '18', '130'); 
 
 */
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (19, NULL, 8, 'Distribution Admins', 'Users who administer distribution \
jobs.', 0, 0); +VALUES ('19', NULL, '8', 'Distribution Admins', 'Users who administer \
distribution jobs.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (131, 35, 6, 1);
+VALUES ('131', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (20, 19, 131); 
+VALUES ('20', '19', '131'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (20, NULL, 8, 'Publishing Admins', 'Users who can use the publishing \
administration tools.', 0, 0); +VALUES ('20', NULL, '8', 'Publishing Admins', 'Users \
who can use the publishing administration tools.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (132, 35, 6, 1);
+VALUES ('132', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (21, 20, 131); 
+VALUES ('21', '20', '131'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (21, NULL, 8, 'System Admins', 'Users who administer system administration \
tools.', 0, 0); +VALUES ('21', NULL, '8', 'System Admins', 'Users who administer \
system administration tools.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (133, 35, 6, 1);
+VALUES ('133', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (22, 21, 133); 
+VALUES ('22', '21', '133'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (22, 0, 58, 'All Preferences', 'All prefernces in the system.', 0, 1);
+VALUES ('22', '0', '58', 'All Preferences', 'All prefernces in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (134, 35, 6, 1);
+VALUES ('134', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (23, 22, 134); 
+VALUES ('23', '22', '134'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (23, NULL, 59, 'All Output Channels', 'All output channels in the system.', \
0, 1); +VALUES ('23', NULL, '59', 'All Output Channels', 'All output channels in the \
system.', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (135, 35, 6, 1);
+VALUES ('135', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (24, 23, 135); 
+VALUES ('24', '23', '135'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (24, NULL, 60, 'All Contributor Types', 'All contributor types in the \
system.', 0, 1); +VALUES ('24', NULL, '60', 'All Contributor Types', 'All contributor \
types in the system.', '0', '1');  INSERT INTO member (id, grp__id, class__id, \
                active)
-VALUES (136, 35, 6, 1);
+VALUES ('136', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (25, 24, 136); 
+VALUES ('25', '24', '136'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (25, NULL, 61, 'All Workflows', 'All workflows in the system.', 0, 1);
+VALUES ('25', NULL, '61', 'All Workflows', 'All workflows in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (137, 35, 6, 1);
+VALUES ('137', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (26, 25, 137); 
+VALUES ('26', '25', '137'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (26, NULL, 47, 'All Categories', 'All categories in the system.', 0, 1);
+VALUES ('26', NULL, '47', 'All Categories', 'All categories in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (138, 35, 6, 1);
+VALUES ('138', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (27, 26, 138); 
+VALUES ('27', '26', '138'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (27, NULL, 70, 'All Elements', 'All elements in the system.', 0, 1);
+VALUES ('27', NULL, '70', 'All Elements', 'All elements in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (139, 35, 6, 1);
+VALUES ('139', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (28, 27, 139); 
+VALUES ('28', '27', '139'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (28, NULL, 64, 'All Element Types', 'All element types in the system.', 0, \
1); +VALUES ('28', NULL, '64', 'All Element Types', 'All element types in the \
system.', '0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (140, 35, 6, 1);
+VALUES ('140', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (29, 28, 140); 
+VALUES ('29', '28', '140'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (29, NULL, 62, 'All Destinations', 'All destinations in the system.', 0, 1);
+VALUES ('29', NULL, '62', 'All Destinations', 'All destinations in the system.', \
'0', '1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (141, 35, 6, 1);
+VALUES ('141', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (30, 29, 141); 
+VALUES ('30', '29', '141'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (30, NULL, 63, 'All Jobs', 'All distribution jobs in the system.', 0, 1);
+VALUES ('30', NULL, '63', 'All Jobs', 'All distribution jobs in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (142, 35, 6, 1);
+VALUES ('142', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (31, 30, 142); 
+VALUES ('31', '30', '142'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (31, NULL, 65, 'All Stories', 'All stories in the system.', 0, 1);
+VALUES ('31', NULL, '65', 'All Stories', 'All stories in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (143, 35, 6, 1);
+VALUES ('143', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (32, 31, 143); 
+VALUES ('32', '31', '143'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (32, NULL, 66, 'All Media', 'All media in the system.', 0, 1);
+VALUES ('32', NULL, '66', 'All Media', 'All media in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (144, 35, 6, 1);
+VALUES ('144', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (33, 32, 144); 
+VALUES ('33', '32', '144'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (33, NULL, 67, 'All Templates', 'All templates in the system.', 0, 1);
+VALUES ('33', NULL, '67', 'All Templates', 'All templates in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (145, 35, 6, 1);
+VALUES ('145', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (34, 33, 145); 
+VALUES ('34', '33', '145'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (34, NULL, 40, 'All Desks', 'All desks in the system.', 0, 1);
+VALUES ('34', NULL, '40', 'All Desks', 'All desks in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (146, 34, 6, 1);
+VALUES ('146', '34', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (35, 34, 146); 
+VALUES ('35', '34', '146'); 
 
 /*
 
@@ -340,265 +340,265 @@
 Templates' instead.
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (34, NULL, 43, 'All Asssets', 'All assets in the system.', 0, 1);
+VALUES ('34', NULL, '43', 'All Asssets', 'All assets in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (146, 35, 6, 1);
+VALUES ('146', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (35, 34, 146);
+VALUES ('35', '34', '146');
 
 */
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (35, NULL, 68, 'All Groups', 'All groups in the system.', 0, 1);
+VALUES ('35', NULL, '68', 'All Groups', 'All groups in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (147, 35, 6, 1);
+VALUES ('147', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (36, 35, 147);
+VALUES ('36', '35', '147');
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (48, 0, 77, 'All Media Types', 'All media types in the system.', 0, 1);
+VALUES ('48', '0', '77', 'All Media Types', 'All media types in the system.', '0', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (200, 35, 6, 1);
+VALUES ('200', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (200, 48, 200);
+VALUES ('200', '48', '200');
 
 /*
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (36, NULL, 8, 'Alert Type Admins', 'Users who administer alert types.', 0, \
0); +VALUES ('36', NULL, '8', 'Alert Type Admins', 'Users who administer alert \
types.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (148, 35, 6, 1);
+VALUES ('148', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (37, 36, 148); 
+VALUES ('37', '36', '148'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (37, NULL, 8, 'Contributor Type Admins', 'Users who administer contributor \
types.', 0, 0); +VALUES ('37', NULL, '8', 'Contributor Type Admins', 'Users who \
administer contributor types.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (149, 35, 6, 1);
+VALUES ('149', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (38, 37, 149); 
+VALUES ('38', '37', '149'); 
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (38, NULL, 8, 'Element Type Admins', 'Users who administer contributor \
types.', 0, 0); +VALUES ('38', NULL, '8', 'Element Type Admins', 'Users who \
administer contributor types.', '0', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (150, 35, 6, 1);
+VALUES ('150', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (39, 38, 150); 
+VALUES ('39', '38', '150'); 
 
 */
 
 -- Writers.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (39, NULL, 9, 'Writers', 'People who contribute writing.', 1, 0);
+VALUES ('39', NULL, '9', 'Writers', 'People who contribute writing.', '1', '0');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (151, 35, 6, 1);
+VALUES ('151', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (40, 39, 151); 
+VALUES ('40', '39', '151'); 
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (152, 24, 9, 1);
+VALUES ('152', '24', '9', '1');
 
 INSERT INTO contrib_type_member (id, object_id, member__id)
-VALUES (2, 39, 152);
+VALUES ('2', '39', '152');
 
 -- All Keywords.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (50, NULL, 28, 'All Keywords', 'All keywords in the system.', 0, 1);
+VALUES ('50', NULL, '28', 'All Keywords', 'All keywords in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (190, 35, 6, 1);
+VALUES ('190', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (60, 50, 190);
+VALUES ('60', '50', '190');
 
 -- All Sites.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (47, NULL, 76, 'All Sites', 'All sites in the system.', 0, 1);
+VALUES ('47', NULL, '76', 'All Sites', 'All sites in the system.', '0', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (165, 35, 6, 1);
+VALUES ('165', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (56, 47, 165);
+VALUES ('56', '47', '165');
 
 -- Create the Default site permanent group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (100, NULL, 43, 'Secret Site Asset Group', NULL, 1, 1);
+VALUES ('100', NULL, '43', 'Secret Site Asset Group', NULL, '1', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (166, 35, 6, 1);
+VALUES ('166', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (57, 100, 166);
+VALUES ('57', '100', '166');
 
 -- Create the Default site READ secret user group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (200, 0, 8, 'Default Site READ Users', '__Site 100 Users__', 1, 1);
+VALUES ('200', '0', '8', 'Default Site READ Users', '__Site 100 Users__', '1', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (700, 3, 6, 1);
+VALUES ('700', '3', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (700, 200, 700);
+VALUES ('700', '200', '700');
 
 -- Create the Default site EDIT secret user group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (201, 0, 8, 'Default Site EDIT Users', '__Site 100 Users__', 1, 1);
+VALUES ('201', '0', '8', 'Default Site EDIT Users', '__Site 100 Users__', '1', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (701, 3, 6, 1);
+VALUES ('701', '3', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (701, 201, 701);
+VALUES ('701', '201', '701');
 
 -- Create the Default site CREATE secret user group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (202, 0, 8, 'Default Site CREATE Users', '__Site 100 Users__', 1, 1);
+VALUES ('202', '0', '8', 'Default Site CREATE Users', '__Site 100 Users__', '1', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (702, 3, 6, 1);
+VALUES ('702', '3', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (702, 202, 702);
+VALUES ('702', '202', '702');
 
 -- Create the Default site DENY secret user group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (203, 0, 8, 'Default Site DENY Users', '__Site 100 Users__', 1, 1);
+VALUES ('203', '0', '8', 'Default Site DENY Users', '__Site 100 Users__', '1', '1');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (703, 3, 6, 1);
+VALUES ('703', '3', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (703, 203, 703);
+VALUES ('703', '203', '703');
 
 -- Create the Default site RECALL secret user group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (204, 0, 8, 'Default Site RECALL Users', '__Site 100 Users__', 1, 1);
+VALUES ('204', '0', '8', 'Default Site RECALL Users', '__Site 100 Users__', '1', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (704, 3, 6, 1);
+VALUES ('704', '3', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (704, 204, 704);
+VALUES ('704', '204', '704');
 
 -- Create the Default site PUBLISH secret user group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (205, 0, 8, 'Default Site PUBLISH Users', '__Site 100 Users__', 1, 1);
+VALUES ('205', '0', '8', 'Default Site PUBLISH Users', '__Site 100 Users__', '1', \
'1');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (705, 3, 6, 1);
+VALUES ('705', '3', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (705, 205, 705);
+VALUES ('705', '205', '705');
 
 -- Illustrators.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (40, NULL, 9, 'Illustrators', 'People who provide original artwork.', 1, 0);
+VALUES ('40', NULL, '9', 'Illustrators', 'People who provide original artwork.', \
'1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (153, 35, 6, 1);
+VALUES ('153', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (41, 40, 153); 
+VALUES ('41', '40', '153'); 
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (154, 24, 9, 1);
+VALUES ('154', '24', '9', '1');
 
 INSERT INTO contrib_type_member (id, object_id, member__id)
-VALUES (3, 40, 154);
+VALUES ('3', '40', '154');
 
 
 -- Edit Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (61, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('61', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (157, 35, 6, 1);
+VALUES ('157', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (42, 61, 157); 
+VALUES ('42', '61', '157'); 
 
 -- Copy Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (62, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('62', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (158, 35, 6, 1);
+VALUES ('158', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (43, 62, 158); 
+VALUES ('43', '62', '158'); 
 
 -- Legal Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (63, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('63', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (159, 35, 6, 1);
+VALUES ('159', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (44, 63, 159); 
+VALUES ('44', '63', '159'); 
 
 -- Publish Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (64, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('64', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (160, 35, 6, 1);
+VALUES ('160', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (45, 64, 160); 
+VALUES ('45', '64', '160'); 
 
 -- Art Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (65, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('65', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (161, 35, 6, 1);
+VALUES ('161', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (46, 65, 161); 
+VALUES ('46', '65', '161'); 
 
 -- Development Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (66, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('66', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (162, 35, 6, 1);
+VALUES ('162', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (47, 66, 162); 
+VALUES ('47', '66', '162'); 
 
 -- Development Desk.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (67, NULL, 43, 'Desk Assets', 'A group for holding assets for Desk objects.', \
1, 0); +VALUES ('67', NULL, '43', 'Desk Assets', 'A group for holding assets for Desk \
objects.', '1', '0');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (163, 35, 6, 1);
+VALUES ('163', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (48, 67, 163); 
+VALUES ('48', '67', '163'); 
 
 -- Root category asset group.
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent)
-VALUES (68, NULL, 43, 'Site 100 Category Assets', '/', 1, 0);
+VALUES ('68', NULL, '43', 'Site 100 Category Assets', '/', '1', '0');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (164, 35, 6, 1);
+VALUES ('164', '35', '6', '1');
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (49, 68, 164);
+VALUES ('49', '68', '164');
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Grp_Attr.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Grp_Attr.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Grp_Attr.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -33,14 +33,12 @@
 --              its subsystem, its grp ID and an attribute name.
 
 CREATE TABLE attr_grp (
-    id         NUMERIC(10)   NOT NULL
+    id         INTEGER       NOT NULL
                              DEFAULT NEXTVAL('seq_attr_grp'),
     subsys     VARCHAR(256)  NOT NULL,
     name       VARCHAR(256)  NOT NULL,
     sql_type   VARCHAR(30)   NOT NULL,
-    active     NUMERIC(1)    DEFAULT 1
-                             NOT NULL
-                             CONSTRAINT ck_attr_grp__active CHECK (active IN (0,1)),
+    active     BOOLEAN       NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_grp__id PRIMARY KEY (id)
 );
 
@@ -51,17 +49,15 @@
 
 
 CREATE TABLE attr_grp_val (
-    id           NUMERIC(10)     NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_attr_grp_val'),
-    object__id   NUMERIC(10)     NOT NULL,
-    attr__id     NUMERIC(10)     NOT NULL,
+    object__id   INTEGER         NOT NULL,
+    attr__id     INTEGER         NOT NULL,
     date_val     TIMESTAMP,
     short_val    VARCHAR(1024),
     blob_val     TEXT,
-    serial       NUMERIC(1)      DEFAULT 0,
-    active       NUMERIC(1)      DEFAULT 1
-                                 NOT NULL
-                                 CONSTRAINT ck_attr_grp_val__active CHECK (active IN \
(0,1)), +    serial       BOOLEAN         DEFAULT FALSE,
+    active       BOOLEAN         NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_attr_grp_val__id PRIMARY KEY (id)
 );
 
@@ -72,14 +68,12 @@
 -- Description: A table to represent metadata on types of attributes.
 
 CREATE TABLE attr_grp_meta (
-    id        NUMERIC(10)     NOT NULL
+    id        INTEGER         NOT NULL
                               DEFAULT NEXTVAL('seq_grp_meta'),
-    attr__id  NUMERIC(10)     NOT NULL,
+    attr__id  INTEGER         NOT NULL,
     name      VARCHAR(256)    NOT NULL,
     value     VARCHAR(2048),
-    active    NUMERIC(1)      DEFAULT 1
-                              NOT NULL
-                              CONSTRAINT ck_attr_grp_meta__active CHECK (active IN \
(0,1)), +    active    BOOLEAN         NOT NULL DEFAULT TRUE,
    CONSTRAINT pk_attr_grp_meta__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Job.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Job.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Job.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -17,36 +17,26 @@
 --
 
 CREATE TABLE job (
-    id            NUMERIC(10, 0)    NOT NULL
+    id            INTEGER           NOT NULL
                                     DEFAULT NEXTVAL('seq_job'),
     name          TEXT              NOT NULL,
-    usr__id       NUMERIC(10, 0)    NOT NULL,
-    sched_time    TIMESTAMP	    NOT NULL
-				    DEFAULT CURRENT_TIMESTAMP,
-    priority      NUMERIC(1,0)      NOT NULL 
+    usr__id       INTEGER           NOT NULL,
+    sched_time    TIMESTAMP	        NOT NULL
+				                    DEFAULT CURRENT_TIMESTAMP,
+    priority      INT2              NOT NULL 
                                     DEFAULT 3
                                     CONSTRAINT ck_job__priority 
                                       CHECK (priority BETWEEN 1 AND 5),
     comp_time     TIMESTAMP,
-    expire        NUMERIC(1, 0)     NOT NULL
-                                    DEFAULT 0
-                                    CONSTRAINT ck_job__expire
-				      CHECK (expire IN (1,0)),
-    failed        NUMERIC(1, 0)     NOT NULL
-                                    DEFAULT 0
-                                    CONSTRAINT ck_job__failed
-				      CHECK (failed IN (1,0)),
-    tries	  NUMERIC(2, 0)	    NOT NULL
-				    DEFAULT 0
+    expire        BOOLEAN           NOT NULL DEFAULT FALSE,
+    failed        BOOLEAN           NOT NULL DEFAULT FALSE,
+    tries	      INT2              NOT NULL DEFAULT 0
                                     CONSTRAINT ck_job__tries
 				      CHECK (tries BETWEEN 0 AND 10),
-    executing     NUMERIC(1, 0)     NOT NULL 
-                                    DEFAULT 0
-                                    CONSTRAINT ck_job__executing
-				      CHECK (executing IN (1,0)),
-    class__id     NUMERIC(10,0)     NOT NULL,
-    story__id     NUMERIC(10,0),
-    media__id     NUMERIC(10,0),
+    executing     BOOLEAN           NOT NULL DEFAULT FALSE,
+    class__id     INTEGER           NOT NULL,
+    story__id     INTEGER,
+    media__id     INTEGER,
     error_message TEXT,
     CONSTRAINT pk_job__id PRIMARY KEY (id)
 );
@@ -57,8 +47,8 @@
 --
 
 CREATE TABLE job__resource(
-    job__id         NUMERIC(10, 0)    NOT NULL,
-    resource__id    NUMERIC(10, 0)    NOT NULL,
+    job__id         INTEGER           NOT NULL,
+    resource__id    INTEGER           NOT NULL,
     CONSTRAINT pk_job__resource PRIMARY KEY (job__id,resource__id)
 );
 
@@ -68,8 +58,8 @@
 --
 
 CREATE TABLE job__server_type(
-    job__id            NUMERIC(10, 0)  NOT NULL,
-    server_type__id     NUMERIC(10, 0) NOT NULL,
+    job__id             INTEGER        NOT NULL,
+    server_type__id     INTEGER        NOT NULL,
     CONSTRAINT pk_job__server_type PRIMARY KEY (job__id,server_type__id)
 );
 
@@ -78,10 +68,10 @@
 --
 
 CREATE TABLE job_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_job_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_job_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Language.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Language.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Language.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -25,14 +25,11 @@
 --              
 
 CREATE TABLE language (
-    id           NUMERIC(10,0)	NOT NULL
+    id           INTEGER      	NOT NULL
                                 DEFAULT NEXTVAL('seq_language'),
     name         VARCHAR(64),
     description  VARCHAR(256),
-    active       NUMERIC(1)     NOT NULL
-                                DEFAULT 1
-                                CONSTRAINT ck_language__active
-                                  CHECK (active IN (0,1)),
+    active       BOOLEAN        NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_language__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/MediaType.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/MediaType.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/MediaType.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -18,14 +18,11 @@
 --
 
 CREATE TABLE media_type (
-    id             NUMERIC(10, 0)    NOT NULL
+    id             INTEGER           NOT NULL
                                      DEFAULT NEXTVAL('seq_media_type'),
     name           VARCHAR(128)      NOT NULL,
     description    VARCHAR(256),
-    active         NUMERIC(1, 0)     NOT NULL
-                                     DEFAULT 1
-                                     CONSTRAINT ck_media_type__active
-                                       CHECK (active IN (1,0)),
+    active         BOOLEAN           NOT NULL DEFAULT TRUE,
     CONSTRAINT pk_media_type__id PRIMARY KEY (id)
 );
 
@@ -35,9 +32,9 @@
 --
 
 CREATE TABLE media_type_ext (
-    id                  NUMERIC(10, 0)    NOT NULL
+    id                  INTEGER           NOT NULL
                                           DEFAULT NEXTVAL('seq_media_type_ext'),
-    media_type__id      NUMERIC(10, 0)    NOT NULL,
+    media_type__id      INTEGER           NOT NULL,
     extension           VARCHAR(10)       NOT NULL,
     CONSTRAINT pk_media_type_ext__id PRIMARY KEY (id)
 );
@@ -48,10 +45,10 @@
 --
 
 CREATE TABLE media_type_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_media_type_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_media_type_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/MediaType.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/MediaType.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/MediaType.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,1232 +11,1232 @@
 DELETE FROM media_type;
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (0, 'none', 'Use when no MIME Type applies, or when they all do.', 1);
+VALUES ('0', 'none', 'Use when no MIME Type applies, or when they all do.', '1');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (1, 'application/andrew-inset', NULL, 1);
+VALUES ('1', 'application/andrew-inset', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (1, 1, 'ez');
+VALUES ('1', '1', 'ez');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (2, 'application/mac-binhex40', NULL, 1);
+VALUES ('2', 'application/mac-binhex40', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (2, 2, 'hqx');
+VALUES ('2', '2', 'hqx');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (3, 'application/mac-compactpro', NULL, 1);
+VALUES ('3', 'application/mac-compactpro', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (3, 3, 'cpt');
+VALUES ('3', '3', 'cpt');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (4, 'application/msword', NULL, 1);
+VALUES ('4', 'application/msword', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (4, 4, 'doc');
+VALUES ('4', '4', 'doc');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (5, 'application/octet-stream', NULL, 1);
+VALUES ('5', 'application/octet-stream', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (5, 5, 'bin');
+VALUES ('5', '5', 'bin');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (6, 5, 'class');
+VALUES ('6', '5', 'class');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (7, 5, 'dms');
+VALUES ('7', '5', 'dms');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (8, 5, 'exe');
+VALUES ('8', '5', 'exe');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (9, 5, 'lha');
+VALUES ('9', '5', 'lha');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (10, 5, 'lzh');
+VALUES ('10', '5', 'lzh');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (6, 'application/oda', NULL, 1);
+VALUES ('6', 'application/oda', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (11, 6, 'oda');
+VALUES ('11', '6', 'oda');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (7, 'application/pdf', NULL, 1);
+VALUES ('7', 'application/pdf', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (12, 7, 'pdf');
+VALUES ('12', '7', 'pdf');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (8, 'application/postscript', NULL, 1);
+VALUES ('8', 'application/postscript', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (13, 8, 'ai');
+VALUES ('13', '8', 'ai');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (14, 8, 'eps');
+VALUES ('14', '8', 'eps');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (15, 8, 'ps');
+VALUES ('15', '8', 'ps');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (9, 'application/smil', NULL, 1);
+VALUES ('9', 'application/smil', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (16, 9, 'smi');
+VALUES ('16', '9', 'smi');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (17, 9, 'smil');
+VALUES ('17', '9', 'smil');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (10, 'application/vnd.mif', NULL, 1);
+VALUES ('10', 'application/vnd.mif', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (18, 10, 'mif');
+VALUES ('18', '10', 'mif');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (11, 'application/vnd.ms-excel', NULL, 1);
+VALUES ('11', 'application/vnd.ms-excel', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (19, 11, 'xls');
+VALUES ('19', '11', 'xls');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (12, 'application/vnd.ms-powerpoint', NULL, 1);
+VALUES ('12', 'application/vnd.ms-powerpoint', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (20, 12, 'ppt');
+VALUES ('20', '12', 'ppt');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (13, 'application/vnd.wap.wbxml', NULL, 1);
+VALUES ('13', 'application/vnd.wap.wbxml', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (21, 13, 'wbxml');
+VALUES ('21', '13', 'wbxml');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (14, 'application/vnd.wap.wmlc', NULL, 1);
+VALUES ('14', 'application/vnd.wap.wmlc', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (22, 14, 'wmlc');
+VALUES ('22', '14', 'wmlc');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (15, 'application/vnd.wap.wmlscriptc', NULL, 1);
+VALUES ('15', 'application/vnd.wap.wmlscriptc', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (23, 15, 'wmlsc');
+VALUES ('23', '15', 'wmlsc');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (16, 'application/x-bcpio', NULL, 1);
+VALUES ('16', 'application/x-bcpio', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (24, 16, 'bcpio');
+VALUES ('24', '16', 'bcpio');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (17, 'application/x-cdlink', NULL, 1);
+VALUES ('17', 'application/x-cdlink', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (25, 17, 'vcd');
+VALUES ('25', '17', 'vcd');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (18, 'application/x-chess-pgn', NULL, 1);
+VALUES ('18', 'application/x-chess-pgn', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (26, 18, 'pgn');
+VALUES ('26', '18', 'pgn');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (19, 'application/x-cpio', NULL, 1);
+VALUES ('19', 'application/x-cpio', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (27, 19, 'cpio');
+VALUES ('27', '19', 'cpio');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (20, 'application/x-csh', NULL, 1);
+VALUES ('20', 'application/x-csh', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (28, 20, 'csh');
+VALUES ('28', '20', 'csh');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (21, 'application/x-director', NULL, 1);
+VALUES ('21', 'application/x-director', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (29, 21, 'dcr');
+VALUES ('29', '21', 'dcr');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (30, 21, 'dir');
+VALUES ('30', '21', 'dir');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (31, 21, 'dxr');
+VALUES ('31', '21', 'dxr');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (22, 'application/x-dvi', NULL, 1);
+VALUES ('22', 'application/x-dvi', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (32, 22, 'dvi');
+VALUES ('32', '22', 'dvi');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (23, 'application/x-futuresplash', NULL, 1);
+VALUES ('23', 'application/x-futuresplash', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (33, 23, 'spl');
+VALUES ('33', '23', 'spl');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (24, 'application/x-gtar', NULL, 1);
+VALUES ('24', 'application/x-gtar', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (34, 24, 'gtar');
+VALUES ('34', '24', 'gtar');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (25, 'application/x-hdf', NULL, 1);
+VALUES ('25', 'application/x-hdf', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (35, 25, 'hdf');
+VALUES ('35', '25', 'hdf');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (26, 'application/x-javascript', NULL, 1);
+VALUES ('26', 'application/x-javascript', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (36, 26, 'js');
+VALUES ('36', '26', 'js');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (27, 'application/x-koan', NULL, 1);
+VALUES ('27', 'application/x-koan', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (37, 27, 'skd');
+VALUES ('37', '27', 'skd');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (38, 27, 'skm');
+VALUES ('38', '27', 'skm');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (39, 27, 'skp');
+VALUES ('39', '27', 'skp');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (40, 27, 'skt');
+VALUES ('40', '27', 'skt');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (28, 'application/x-latex', NULL, 1);
+VALUES ('28', 'application/x-latex', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (41, 28, 'latex');
+VALUES ('41', '28', 'latex');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (29, 'application/x-netcdf', NULL, 1);
+VALUES ('29', 'application/x-netcdf', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (42, 29, 'cdf');
+VALUES ('42', '29', 'cdf');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (43, 29, 'nc');
+VALUES ('43', '29', 'nc');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (30, 'application/x-sh', NULL, 1);
+VALUES ('30', 'application/x-sh', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (44, 30, 'sh');
+VALUES ('44', '30', 'sh');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (31, 'application/x-shar', NULL, 1);
+VALUES ('31', 'application/x-shar', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (45, 31, 'shar');
+VALUES ('45', '31', 'shar');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (32, 'application/x-shockwave-flash', NULL, 1);
+VALUES ('32', 'application/x-shockwave-flash', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (46, 32, 'swf');
+VALUES ('46', '32', 'swf');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (33, 'application/x-stuffit', NULL, 1);
+VALUES ('33', 'application/x-stuffit', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (47, 33, 'sit');
+VALUES ('47', '33', 'sit');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (34, 'application/x-sv4cpio', NULL, 1);
+VALUES ('34', 'application/x-sv4cpio', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (48, 34, 'sv4cpio');
+VALUES ('48', '34', 'sv4cpio');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (35, 'application/x-sv4crc', NULL, 1);
+VALUES ('35', 'application/x-sv4crc', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (49, 35, 'sv4crc');
+VALUES ('49', '35', 'sv4crc');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (36, 'application/x-tar', NULL, 1);
+VALUES ('36', 'application/x-tar', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (50, 36, 'tar');
+VALUES ('50', '36', 'tar');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (37, 'application/x-tcl', NULL, 1);
+VALUES ('37', 'application/x-tcl', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (51, 37, 'tcl');
+VALUES ('51', '37', 'tcl');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (38, 'application/x-tex', NULL, 1);
+VALUES ('38', 'application/x-tex', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (52, 38, 'tex');
+VALUES ('52', '38', 'tex');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (39, 'application/x-texinfo', NULL, 1);
+VALUES ('39', 'application/x-texinfo', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (53, 39, 'texi');
+VALUES ('53', '39', 'texi');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (54, 39, 'texinfo');
+VALUES ('54', '39', 'texinfo');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (40, 'application/x-troff', NULL, 1);
+VALUES ('40', 'application/x-troff', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (55, 40, 'roff');
+VALUES ('55', '40', 'roff');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (56, 40, 't');
+VALUES ('56', '40', 't');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (57, 40, 'tr');
+VALUES ('57', '40', 'tr');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (41, 'application/x-troff-man', NULL, 1);
+VALUES ('41', 'application/x-troff-man', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (58, 41, 'man');
+VALUES ('58', '41', 'man');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (42, 'application/x-troff-me', NULL, 1);
+VALUES ('42', 'application/x-troff-me', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (59, 42, 'me');
+VALUES ('59', '42', 'me');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (43, 'application/x-troff-ms', NULL, 1);
+VALUES ('43', 'application/x-troff-ms', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (60, 43, 'ms');
+VALUES ('60', '43', 'ms');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (44, 'application/x-ustar', NULL, 1);
+VALUES ('44', 'application/x-ustar', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (61, 44, 'ustar');
+VALUES ('61', '44', 'ustar');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (45, 'application/x-wais-source', NULL, 1);
+VALUES ('45', 'application/x-wais-source', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (62, 45, 'src');
+VALUES ('62', '45', 'src');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (46, 'application/zip', NULL, 1);
+VALUES ('46', 'application/zip', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (63, 46, 'zip');
+VALUES ('63', '46', 'zip');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (47, 'audio/basic', NULL, 1);
+VALUES ('47', 'audio/basic', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (64, 47, 'au');
+VALUES ('64', '47', 'au');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (65, 47, 'snd');
+VALUES ('65', '47', 'snd');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (48, 'audio/midi', NULL, 1);
+VALUES ('48', 'audio/midi', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (66, 48, 'kar');
+VALUES ('66', '48', 'kar');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (67, 48, 'mid');
+VALUES ('67', '48', 'mid');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (68, 48, 'midi');
+VALUES ('68', '48', 'midi');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (49, 'audio/mpeg', NULL, 1);
+VALUES ('49', 'audio/mpeg', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (69, 49, 'mp2');
+VALUES ('69', '49', 'mp2');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (70, 49, 'mp3');
+VALUES ('70', '49', 'mp3');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (71, 49, 'mpga');
+VALUES ('71', '49', 'mpga');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (50, 'audio/x-aiff', NULL, 1);
+VALUES ('50', 'audio/x-aiff', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (72, 50, 'aif');
+VALUES ('72', '50', 'aif');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (73, 50, 'aifc');
+VALUES ('73', '50', 'aifc');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (74, 50, 'aiff');
+VALUES ('74', '50', 'aiff');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (51, 'audio/x-pn-realaudio', NULL, 1);
+VALUES ('51', 'audio/x-pn-realaudio', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (75, 51, 'ram');
+VALUES ('75', '51', 'ram');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (76, 51, 'rm');
+VALUES ('76', '51', 'rm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (52, 'audio/x-pn-realaudio-plugin', NULL, 1);
+VALUES ('52', 'audio/x-pn-realaudio-plugin', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (77, 52, 'rpm');
+VALUES ('77', '52', 'rpm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (53, 'audio/x-realaudio', NULL, 1);
+VALUES ('53', 'audio/x-realaudio', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (78, 53, 'ra');
+VALUES ('78', '53', 'ra');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (54, 'audio/x-wav', NULL, 1);
+VALUES ('54', 'audio/x-wav', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (79, 54, 'wav');
+VALUES ('79', '54', 'wav');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (55, 'chemical/x-pdb', NULL, 1);
+VALUES ('55', 'chemical/x-pdb', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (80, 55, 'pdb');
+VALUES ('80', '55', 'pdb');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (56, 'chemical/x-xyz', NULL, 1);
+VALUES ('56', 'chemical/x-xyz', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (81, 56, 'xyz');
+VALUES ('81', '56', 'xyz');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (57, 'image/bmp', NULL, 1);
+VALUES ('57', 'image/bmp', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (82, 57, 'bmp');
+VALUES ('82', '57', 'bmp');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (58, 'image/gif', NULL, 1);
+VALUES ('58', 'image/gif', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (83, 58, 'gif');
+VALUES ('83', '58', 'gif');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (59, 'image/ief', NULL, 1);
+VALUES ('59', 'image/ief', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (84, 59, 'ief');
+VALUES ('84', '59', 'ief');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (60, 'image/jpeg', NULL, 1);
+VALUES ('60', 'image/jpeg', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (85, 60, 'jpe');
+VALUES ('85', '60', 'jpe');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (86, 60, 'jpeg');
+VALUES ('86', '60', 'jpeg');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (87, 60, 'jpg');
+VALUES ('87', '60', 'jpg');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (61, 'image/png', NULL, 1);
+VALUES ('61', 'image/png', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (88, 61, 'png');
+VALUES ('88', '61', 'png');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (62, 'image/tiff', NULL, 1);
+VALUES ('62', 'image/tiff', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (89, 62, 'tif');
+VALUES ('89', '62', 'tif');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (90, 62, 'tiff');
+VALUES ('90', '62', 'tiff');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (63, 'image/vnd.wap.wbmp', NULL, 1);
+VALUES ('63', 'image/vnd.wap.wbmp', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (91, 63, 'wbmp');
+VALUES ('91', '63', 'wbmp');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (64, 'image/x-cmu-raster', NULL, 1);
+VALUES ('64', 'image/x-cmu-raster', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (92, 64, 'ras');
+VALUES ('92', '64', 'ras');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (65, 'image/x-portable-anymap', NULL, 1);
+VALUES ('65', 'image/x-portable-anymap', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (93, 65, 'pnm');
+VALUES ('93', '65', 'pnm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (66, 'image/x-portable-bitmap', NULL, 1);
+VALUES ('66', 'image/x-portable-bitmap', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (94, 66, 'pbm');
+VALUES ('94', '66', 'pbm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (67, 'image/x-portable-graymap', NULL, 1);
+VALUES ('67', 'image/x-portable-graymap', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (95, 67, 'pgm');
+VALUES ('95', '67', 'pgm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (68, 'image/x-portable-pixmap', NULL, 1);
+VALUES ('68', 'image/x-portable-pixmap', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (96, 68, 'ppm');
+VALUES ('96', '68', 'ppm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (69, 'image/x-rgb', NULL, 1);
+VALUES ('69', 'image/x-rgb', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (97, 69, 'rgb');
+VALUES ('97', '69', 'rgb');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (70, 'image/x-xbitmap', NULL, 1);
+VALUES ('70', 'image/x-xbitmap', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (98, 70, 'xbm');
+VALUES ('98', '70', 'xbm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (71, 'image/x-xpixmap', NULL, 1);
+VALUES ('71', 'image/x-xpixmap', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (99, 71, 'xpm');
+VALUES ('99', '71', 'xpm');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (72, 'image/x-xwindowdump', NULL, 1);
+VALUES ('72', 'image/x-xwindowdump', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (100, 72, 'xwd');
+VALUES ('100', '72', 'xwd');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (73, 'model/iges', NULL, 1);
+VALUES ('73', 'model/iges', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (101, 73, 'iges');
+VALUES ('101', '73', 'iges');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (102, 73, 'igs');
+VALUES ('102', '73', 'igs');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (74, 'model/mesh', NULL, 1);
+VALUES ('74', 'model/mesh', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (103, 74, 'mesh');
+VALUES ('103', '74', 'mesh');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (104, 74, 'msh');
+VALUES ('104', '74', 'msh');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (105, 74, 'silo');
+VALUES ('105', '74', 'silo');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (75, 'model/vrml', NULL, 1);
+VALUES ('75', 'model/vrml', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (106, 75, 'vrml');
+VALUES ('106', '75', 'vrml');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (107, 75, 'wrl');
+VALUES ('107', '75', 'wrl');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (76, 'text/css', NULL, 1);
+VALUES ('76', 'text/css', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (108, 76, 'css');
+VALUES ('108', '76', 'css');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (77, 'text/html', NULL, 1);
+VALUES ('77', 'text/html', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (109, 77, 'htm');
+VALUES ('109', '77', 'htm');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (110, 77, 'html');
+VALUES ('110', '77', 'html');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (78, 'text/plain', NULL, 1);
+VALUES ('78', 'text/plain', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (111, 78, 'asc');
+VALUES ('111', '78', 'asc');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (112, 78, 'txt');
+VALUES ('112', '78', 'txt');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (79, 'text/richtext', NULL, 1);
+VALUES ('79', 'text/richtext', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (113, 79, 'rtx');
+VALUES ('113', '79', 'rtx');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (80, 'text/rtf', NULL, 1);
+VALUES ('80', 'text/rtf', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (114, 80, 'rtf');
+VALUES ('114', '80', 'rtf');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (81, 'text/sgml', NULL, 1);
+VALUES ('81', 'text/sgml', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (115, 81, 'sgm');
+VALUES ('115', '81', 'sgm');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (116, 81, 'sgml');
+VALUES ('116', '81', 'sgml');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (82, 'text/tab-separated-values', NULL, 1);
+VALUES ('82', 'text/tab-separated-values', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (117, 82, 'tsv');
+VALUES ('117', '82', 'tsv');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (83, 'text/vnd.wap.wml', NULL, 1);
+VALUES ('83', 'text/vnd.wap.wml', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (118, 83, 'wml');
+VALUES ('118', '83', 'wml');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (84, 'text/vnd.wap.wmlscript', NULL, 1);
+VALUES ('84', 'text/vnd.wap.wmlscript', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (119, 84, 'wmls');
+VALUES ('119', '84', 'wmls');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (85, 'text/x-setext', NULL, 1);
+VALUES ('85', 'text/x-setext', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (120, 85, 'etx');
+VALUES ('120', '85', 'etx');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (86, 'text/xml', NULL, 1);
+VALUES ('86', 'text/xml', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (121, 86, 'xml');
+VALUES ('121', '86', 'xml');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (87, 'video/mpeg', NULL, 1);
+VALUES ('87', 'video/mpeg', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (122, 87, 'mpe');
+VALUES ('122', '87', 'mpe');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (123, 87, 'mpeg');
+VALUES ('123', '87', 'mpeg');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (124, 87, 'mpg');
+VALUES ('124', '87', 'mpg');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (88, 'video/quicktime', NULL, 1);
+VALUES ('88', 'video/quicktime', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (125, 88, 'mov');
+VALUES ('125', '88', 'mov');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (126, 88, 'qt');
+VALUES ('126', '88', 'qt');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (89, 'video/x-msvideo', NULL, 1);
+VALUES ('89', 'video/x-msvideo', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (127, 89, 'avi');
+VALUES ('127', '89', 'avi');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (90, 'video/x-sgi-movie', NULL, 1);
+VALUES ('90', 'video/x-sgi-movie', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (128, 90, 'movie');
+VALUES ('128', '90', 'movie');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (91, 'x-conference/x-cooltalk', NULL, 1);
+VALUES ('91', 'x-conference/x-cooltalk', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (129, 91, 'ice');
+VALUES ('129', '91', 'ice');
 
 INSERT INTO media_type (id, name, description, active)
-VALUES (92, 'application/xhtml+xml', NULL, 1);
+VALUES ('92', 'application/xhtml+xml', NULL, '1');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (130, 92, 'xhtml');
+VALUES ('130', '92', 'xhtml');
 
 INSERT INTO media_type_ext (id, media_type__id, extension)
-VALUES (131, 92, 'xht');
+VALUES ('131', '92', 'xht');
 
 -- Add them all to "All Media Types" group.
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (800, 48, 72, 1);
+VALUES ('800', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (800, 0, 800);
+VALUES ('800', '0', '800');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (801, 48, 72, 1);
+VALUES ('801', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (801, 1, 801);
+VALUES ('801', '1', '801');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (802, 48, 72, 1);
+VALUES ('802', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (802, 2, 802);
+VALUES ('802', '2', '802');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (803, 48, 72, 1);
+VALUES ('803', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (803, 3, 803);
+VALUES ('803', '3', '803');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (804, 48, 72, 1);
+VALUES ('804', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (804, 4, 804);
+VALUES ('804', '4', '804');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (805, 48, 72, 1);
+VALUES ('805', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (805, 5, 805);
+VALUES ('805', '5', '805');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (806, 48, 72, 1);
+VALUES ('806', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (806, 6, 806);
+VALUES ('806', '6', '806');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (807, 48, 72, 1);
+VALUES ('807', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (807, 7, 807);
+VALUES ('807', '7', '807');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (808, 48, 72, 1);
+VALUES ('808', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (808, 8, 808);
+VALUES ('808', '8', '808');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (809, 48, 72, 1);
+VALUES ('809', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (809, 9, 809);
+VALUES ('809', '9', '809');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (810, 48, 72, 1);
+VALUES ('810', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (810, 10, 810);
+VALUES ('810', '10', '810');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (811, 48, 72, 1);
+VALUES ('811', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (811, 11, 811);
+VALUES ('811', '11', '811');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (812, 48, 72, 1);
+VALUES ('812', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (812, 12, 812);
+VALUES ('812', '12', '812');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (813, 48, 72, 1);
+VALUES ('813', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (813, 13, 813);
+VALUES ('813', '13', '813');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (814, 48, 72, 1);
+VALUES ('814', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (814, 14, 814);
+VALUES ('814', '14', '814');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (815, 48, 72, 1);
+VALUES ('815', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (815, 15, 815);
+VALUES ('815', '15', '815');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (816, 48, 72, 1);
+VALUES ('816', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (816, 16, 816);
+VALUES ('816', '16', '816');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (817, 48, 72, 1);
+VALUES ('817', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (817, 17, 817);
+VALUES ('817', '17', '817');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (818, 48, 72, 1);
+VALUES ('818', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (818, 18, 818);
+VALUES ('818', '18', '818');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (819, 48, 72, 1);
+VALUES ('819', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (819, 19, 819);
+VALUES ('819', '19', '819');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (820, 48, 72, 1);
+VALUES ('820', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (820, 20, 820);
+VALUES ('820', '20', '820');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (821, 48, 72, 1);
+VALUES ('821', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (821, 21, 821);
+VALUES ('821', '21', '821');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (822, 48, 72, 1);
+VALUES ('822', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (822, 22, 822);
+VALUES ('822', '22', '822');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (823, 48, 72, 1);
+VALUES ('823', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (823, 23, 823);
+VALUES ('823', '23', '823');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (824, 48, 72, 1);
+VALUES ('824', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (824, 24, 824);
+VALUES ('824', '24', '824');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (825, 48, 72, 1);
+VALUES ('825', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (825, 25, 825);
+VALUES ('825', '25', '825');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (826, 48, 72, 1);
+VALUES ('826', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (826, 26, 826);
+VALUES ('826', '26', '826');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (827, 48, 72, 1);
+VALUES ('827', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (827, 27, 827);
+VALUES ('827', '27', '827');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (828, 48, 72, 1);
+VALUES ('828', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (828, 28, 828);
+VALUES ('828', '28', '828');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (829, 48, 72, 1);
+VALUES ('829', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (829, 29, 829);
+VALUES ('829', '29', '829');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (830, 48, 72, 1);
+VALUES ('830', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (830, 30, 830);
+VALUES ('830', '30', '830');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (831, 48, 72, 1);
+VALUES ('831', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (831, 31, 831);
+VALUES ('831', '31', '831');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (832, 48, 72, 1);
+VALUES ('832', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (832, 32, 832);
+VALUES ('832', '32', '832');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (833, 48, 72, 1);
+VALUES ('833', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (833, 33, 833);
+VALUES ('833', '33', '833');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (834, 48, 72, 1);
+VALUES ('834', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (834, 34, 834);
+VALUES ('834', '34', '834');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (835, 48, 72, 1);
+VALUES ('835', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (835, 35, 835);
+VALUES ('835', '35', '835');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (836, 48, 72, 1);
+VALUES ('836', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (836, 36, 836);
+VALUES ('836', '36', '836');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (837, 48, 72, 1);
+VALUES ('837', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (837, 37, 837);
+VALUES ('837', '37', '837');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (838, 48, 72, 1);
+VALUES ('838', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (838, 38, 838);
+VALUES ('838', '38', '838');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (839, 48, 72, 1);
+VALUES ('839', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (839, 39, 839);
+VALUES ('839', '39', '839');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (840, 48, 72, 1);
+VALUES ('840', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (840, 40, 840);
+VALUES ('840', '40', '840');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (841, 48, 72, 1);
+VALUES ('841', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (841, 41, 841);
+VALUES ('841', '41', '841');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (842, 48, 72, 1);
+VALUES ('842', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (842, 42, 842);
+VALUES ('842', '42', '842');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (843, 48, 72, 1);
+VALUES ('843', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (843, 43, 843);
+VALUES ('843', '43', '843');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (844, 48, 72, 1);
+VALUES ('844', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (844, 44, 844);
+VALUES ('844', '44', '844');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (845, 48, 72, 1);
+VALUES ('845', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (845, 45, 845);
+VALUES ('845', '45', '845');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (846, 48, 72, 1);
+VALUES ('846', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (846, 46, 846);
+VALUES ('846', '46', '846');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (847, 48, 72, 1);
+VALUES ('847', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (847, 47, 847);
+VALUES ('847', '47', '847');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (848, 48, 72, 1);
+VALUES ('848', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (848, 48, 848);
+VALUES ('848', '48', '848');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (849, 48, 72, 1);
+VALUES ('849', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (849, 49, 849);
+VALUES ('849', '49', '849');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (850, 48, 72, 1);
+VALUES ('850', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (850, 50, 850);
+VALUES ('850', '50', '850');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (851, 48, 72, 1);
+VALUES ('851', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (851, 51, 851);
+VALUES ('851', '51', '851');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (852, 48, 72, 1);
+VALUES ('852', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (852, 52, 852);
+VALUES ('852', '52', '852');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (853, 48, 72, 1);
+VALUES ('853', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (853, 53, 853);
+VALUES ('853', '53', '853');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (854, 48, 72, 1);
+VALUES ('854', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (854, 54, 854);
+VALUES ('854', '54', '854');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (855, 48, 72, 1);
+VALUES ('855', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (855, 55, 855);
+VALUES ('855', '55', '855');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (856, 48, 72, 1);
+VALUES ('856', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (856, 56, 856);
+VALUES ('856', '56', '856');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (857, 48, 72, 1);
+VALUES ('857', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (857, 57, 857);
+VALUES ('857', '57', '857');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (858, 48, 72, 1);
+VALUES ('858', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (858, 58, 858);
+VALUES ('858', '58', '858');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (859, 48, 72, 1);
+VALUES ('859', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (859, 59, 859);
+VALUES ('859', '59', '859');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (860, 48, 72, 1);
+VALUES ('860', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (860, 60, 860);
+VALUES ('860', '60', '860');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (861, 48, 72, 1);
+VALUES ('861', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (861, 61, 861);
+VALUES ('861', '61', '861');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (862, 48, 72, 1);
+VALUES ('862', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (862, 62, 862);
+VALUES ('862', '62', '862');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (863, 48, 72, 1);
+VALUES ('863', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (863, 63, 863);
+VALUES ('863', '63', '863');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (864, 48, 72, 1);
+VALUES ('864', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (864, 64, 864);
+VALUES ('864', '64', '864');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (865, 48, 72, 1);
+VALUES ('865', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (865, 65, 865);
+VALUES ('865', '65', '865');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (866, 48, 72, 1);
+VALUES ('866', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (866, 66, 866);
+VALUES ('866', '66', '866');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (867, 48, 72, 1);
+VALUES ('867', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (867, 67, 867);
+VALUES ('867', '67', '867');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (868, 48, 72, 1);
+VALUES ('868', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (868, 68, 868);
+VALUES ('868', '68', '868');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (869, 48, 72, 1);
+VALUES ('869', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (869, 69, 869);
+VALUES ('869', '69', '869');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (870, 48, 72, 1);
+VALUES ('870', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (870, 70, 870);
+VALUES ('870', '70', '870');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (871, 48, 72, 1);
+VALUES ('871', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (871, 71, 871);
+VALUES ('871', '71', '871');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (872, 48, 72, 1);
+VALUES ('872', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (872, 72, 872);
+VALUES ('872', '72', '872');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (873, 48, 72, 1);
+VALUES ('873', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (873, 73, 873);
+VALUES ('873', '73', '873');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (874, 48, 72, 1);
+VALUES ('874', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (874, 74, 874);
+VALUES ('874', '74', '874');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (875, 48, 72, 1);
+VALUES ('875', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (875, 75, 875);
+VALUES ('875', '75', '875');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (876, 48, 72, 1);
+VALUES ('876', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (876, 76, 876);
+VALUES ('876', '76', '876');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (877, 48, 72, 1);
+VALUES ('877', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (877, 77, 877);
+VALUES ('877', '77', '877');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (878, 48, 72, 1);
+VALUES ('878', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (878, 78, 878);
+VALUES ('878', '78', '878');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (879, 48, 72, 1);
+VALUES ('879', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (879, 79, 879);
+VALUES ('879', '79', '879');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (880, 48, 72, 1);
+VALUES ('880', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (880, 80, 880);
+VALUES ('880', '80', '880');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (881, 48, 72, 1);
+VALUES ('881', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (881, 81, 881);
+VALUES ('881', '81', '881');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (882, 48, 72, 1);
+VALUES ('882', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (882, 82, 882);
+VALUES ('882', '82', '882');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (883, 48, 72, 1);
+VALUES ('883', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (883, 83, 883);
+VALUES ('883', '83', '883');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (884, 48, 72, 1);
+VALUES ('884', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (884, 84, 884);
+VALUES ('884', '84', '884');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (885, 48, 72, 1);
+VALUES ('885', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (885, 85, 885);
+VALUES ('885', '85', '885');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (886, 48, 72, 1);
+VALUES ('886', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (886, 86, 886);
+VALUES ('886', '86', '886');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (887, 48, 72, 1);
+VALUES ('887', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (887, 87, 887);
+VALUES ('887', '87', '887');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (888, 48, 72, 1);
+VALUES ('888', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (888, 88, 888);
+VALUES ('888', '88', '888');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (889, 48, 72, 1);
+VALUES ('889', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (889, 89, 889);
+VALUES ('889', '89', '889');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (890, 48, 72, 1);
+VALUES ('890', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (890, 90, 890);
+VALUES ('890', '90', '890');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (891, 48, 72, 1);
+VALUES ('891', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (891, 91, 891);
+VALUES ('891', '91', '891');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (892, 48, 72, 1);
+VALUES ('892', '48', '72', '1');
 
 INSERT INTO media_type_member (id, object_id, member__id)
-VALUES (892, 92, 892);
+VALUES ('892', '92', '892');

Modified: bricolage/trunk/sql/Pg/Bric/Util/Pref.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Pref.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Pref.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -21,18 +21,15 @@
 --        Global preferences.
 
 CREATE TABLE pref (
-    id           NUMERIC(10, 0)  NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_pref'),
     name         VARCHAR(64)     NOT NULL,
     description  VARCHAR(256),
     value        VARCHAR(256),
     def          VARCHAR(256),
-    manual	 NUMERIC(1,0) NOT NULL DEFAULT 0,
-    opt_type     VARCHAR(16)  NOT NULL,
-    can_be_overridden  NUMERIC(1,0)   NOT NULL DEFAULT 0,
-                                      CONSTRAINT ck_pref__can_be_overridden
-                                        CHECK (can_be_overridden IN (0,1)),
-    CONSTRAINT ck_pref__manual CHECK (manual IN (0,1)),
+    manual	     BOOLEAN         NOT NULL DEFAULT FALSE,
+    opt_type     VARCHAR(16)     NOT NULL,
+    can_be_overridden  BOOLEAN   NOT NULL DEFAULT FALSE,
     CONSTRAINT pk_pref__id PRIMARY KEY (id)
 );
 
@@ -41,10 +38,10 @@
 --        Preferences overridden by a specific usr.
 
 CREATE TABLE usr_pref (
-    id           NUMERIC(10, 0)  NOT NULL
+    id           INTEGER         NOT NULL
                                  DEFAULT NEXTVAL('seq_usr_pref'),
-    pref__id     NUMERIC(10, 0)  NOT NULL,
-    usr__id      NUMERIC(10, 0)  NOT NULL,
+    pref__id     INTEGER         NOT NULL,
+    usr__id      INTEGER         NOT NULL,
     value        VARCHAR(256)    NOT NULL,
     CONSTRAINT pk_usr_pref__pref__id__value PRIMARY KEY (id)
 );
@@ -54,7 +51,7 @@
 --        Preference options.
 
 CREATE TABLE pref_opt (
-    pref__id     NUMERIC(10, 0)  NOT NULL,
+    pref__id     INTEGER         NOT NULL,
     value        VARCHAR(256)    NOT NULL,
     description  VARCHAR(256),
     CONSTRAINT pk_pref_opt__pref__id__value PRIMARY KEY (pref__id, value)
@@ -66,10 +63,10 @@
 --
 
 CREATE TABLE pref_member (
-    id          NUMERIC(10,0)  NOT NULL
+    id          INTEGER        NOT NULL
                                DEFAULT NEXTVAL('seq_pref_member'),
-    object_id   NUMERIC(10,0)  NOT NULL,
-    member__id  NUMERIC(10,0)  NOT NULL,
+    object_id   INTEGER        NOT NULL,
+    member__id  INTEGER        NOT NULL,
     CONSTRAINT pk_pref_member__id PRIMARY KEY (id)
 );
 

Modified: bricolage/trunk/sql/Pg/Bric/Util/Pref.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Pref.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Pref.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -6,58 +6,58 @@
 -- Author:  David Wheeler <david@wheeler.net>
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (1, 'Time Zone', 'Time Zone', 'America/Los_Angeles', 'America/Los_Angeles', \
0, 'select'); +VALUES ('1', 'Time Zone', 'Time Zone', 'America/Los_Angeles', \
'America/Los_Angeles', '0', 'select');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (401, 22, 48, 1);
+VALUES ('401', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (1, 1, 401); 
+VALUES ('1', '1', '401'); 
 
 -- Some useful defaults not found in /usr/share/zoneinfo/zone.tab, though there
 -- might be some overlap.
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'UTC', 'Coordinated Universal Time (UTC)');
+VALUES ('1', 'UTC', 'Coordinated Universal Time (UTC)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Cuba', 'Cuba');
+VALUES ('1', 'Cuba', 'Cuba');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Egypt', 'Egypt');
+VALUES ('1', 'Egypt', 'Egypt');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Eire', 'Eire');
+VALUES ('1', 'Eire', 'Eire');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Hongkong', 'Hong Kong');
+VALUES ('1', 'Hongkong', 'Hong Kong');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Iceland', 'Iceland');
+VALUES ('1', 'Iceland', 'Iceland');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Iran', 'Iran');
+VALUES ('1', 'Iran', 'Iran');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Israel', 'Israel');
+VALUES ('1', 'Israel', 'Israel');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Jamaica', 'Jamaica');
+VALUES ('1', 'Jamaica', 'Jamaica');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Japan', 'Japan');
+VALUES ('1', 'Japan', 'Japan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Kwajalein', 'Kwajalein');
+VALUES ('1', 'Kwajalein', 'Kwajalein');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Libya', 'Libya');
+VALUES ('1', 'Libya', 'Libya');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Navajo', 'Navajo');
+VALUES ('1', 'Navajo', 'Navajo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Singapore', 'Singapore');
+VALUES ('1', 'Singapore', 'Singapore');
 
 
 /* The following TZ values were created with this Perl script, running on Red
@@ -86,7 +86,7 @@
 #    print "$zone: $desc\n";
     print qq{
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, '$zone', '$desc');
+VALUES ('1', '$zone', '$desc');
 };
 }
 close TZ;
@@ -94,1559 +94,1559 @@
 */
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Andorra', 'Europe/Andorra');
+VALUES ('1', 'Europe/Andorra', 'Europe/Andorra');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Dubai', 'Asia - Dubai');
+VALUES ('1', 'Asia/Dubai', 'Asia - Dubai');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Kabul', 'Asia - Kabul');
+VALUES ('1', 'Asia/Kabul', 'Asia - Kabul');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Antigua', 'America - Antigua');
+VALUES ('1', 'America/Antigua', 'America - Antigua');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Anguilla', 'America - Anguilla');
+VALUES ('1', 'America/Anguilla', 'America - Anguilla');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Tirane', 'Europe - Tirane');
+VALUES ('1', 'Europe/Tirane', 'Europe - Tirane');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Yerevan', 'Asia - Yerevan');
+VALUES ('1', 'Asia/Yerevan', 'Asia - Yerevan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Curacao', 'America - Curacao');
+VALUES ('1', 'America/Curacao', 'America - Curacao');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Luanda', 'Africa - Luanda');
+VALUES ('1', 'Africa/Luanda', 'Africa - Luanda');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/McMurdo', 'McMurdo Station, Ross Island');
+VALUES ('1', 'Antarctica/McMurdo', 'McMurdo Station, Ross Island');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/South_Pole', 'Amundsen-Scott Station, South Pole');
+VALUES ('1', 'Antarctica/South_Pole', 'Amundsen-Scott Station, South Pole');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/Palmer', 'Palmer Station, Anvers Island');
+VALUES ('1', 'Antarctica/Palmer', 'Palmer Station, Anvers Island');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/Mawson', 'Mawson Station, Holme Bay');
+VALUES ('1', 'Antarctica/Mawson', 'Mawson Station, Holme Bay');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/Davis', 'Davis Station, Vestfold Hills');
+VALUES ('1', 'Antarctica/Davis', 'Davis Station, Vestfold Hills');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/Casey', 'Casey Station, Bailey Peninsula');
+VALUES ('1', 'Antarctica/Casey', 'Casey Station, Bailey Peninsula');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/DumontDUrville', 'Dumont-d''Urville Base');
+VALUES ('1', 'Antarctica/DumontDUrville', 'Dumont-d''Urville Base');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Antarctica/Syowa', 'Syowa Station, E Ongul I');
+VALUES ('1', 'Antarctica/Syowa', 'Syowa Station, E Ongul I');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Buenos_Aires', 'E Argentina - Buenos Aires');
+VALUES ('1', 'America/Buenos_Aires', 'E Argentina - Buenos Aires');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Rosario', 'NE Argentina - Rosario');
+VALUES ('1', 'America/Rosario', 'NE Argentina - Rosario');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Cordoba', 'West Argentina - Cordoba');
+VALUES ('1', 'America/Cordoba', 'West Argentina - Cordoba');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Jujuy', 'Jujuy (JY)');
+VALUES ('1', 'America/Jujuy', 'Jujuy (JY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Catamarca', 'Catamarca (CT)');
+VALUES ('1', 'America/Catamarca', 'Catamarca (CT)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Mendoza', 'Mendoza (MZ)');
+VALUES ('1', 'America/Mendoza', 'Mendoza (MZ)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Pago_Pago', 'Pacific - Pago Pago');
+VALUES ('1', 'Pacific/Pago_Pago', 'Pacific - Pago Pago');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Vienna', 'Europe - Vienna');
+VALUES ('1', 'Europe/Vienna', 'Europe - Vienna');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Lord_Howe', 'Lord Howe Island');
+VALUES ('1', 'Australia/Lord_Howe', 'Lord Howe Island');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Hobart', 'Tasmania');
+VALUES ('1', 'Australia/Hobart', 'Tasmania');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Melbourne', 'Victoria');
+VALUES ('1', 'Australia/Melbourne', 'Victoria');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Sydney', 'New South Wales - Sydney');
+VALUES ('1', 'Australia/Sydney', 'New South Wales - Sydney');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Broken_Hill', 'New South Wales - Broken Hill');
+VALUES ('1', 'Australia/Broken_Hill', 'New South Wales - Broken Hill');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Brisbane', 'Queensland - Brisbane');
+VALUES ('1', 'Australia/Brisbane', 'Queensland - Brisbane');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Lindeman', 'Queensland - Holiday Islands');
+VALUES ('1', 'Australia/Lindeman', 'Queensland - Holiday Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Adelaide', 'South Australia');
+VALUES ('1', 'Australia/Adelaide', 'South Australia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Darwin', 'Northern Territory');
+VALUES ('1', 'Australia/Darwin', 'Northern Territory');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Australia/Perth', 'Western Australia');
+VALUES ('1', 'Australia/Perth', 'Western Australia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Aruba', 'America - Aruba');
+VALUES ('1', 'America/Aruba', 'America - Aruba');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Baku', 'Asia - Baku');
+VALUES ('1', 'Asia/Baku', 'Asia - Baku');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Sarajevo', 'Europe - Sarajevo');
+VALUES ('1', 'Europe/Sarajevo', 'Europe - Sarajevo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Barbados', 'America - Barbados');
+VALUES ('1', 'America/Barbados', 'America - Barbados');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Dacca', 'Asia - Dacca');
+VALUES ('1', 'Asia/Dacca', 'Asia - Dacca');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Brussels', 'Europe - Brussels');
+VALUES ('1', 'Europe/Brussels', 'Europe - Brussels');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Ouagadougou', 'Africa - Ouagadougou');
+VALUES ('1', 'Africa/Ouagadougou', 'Africa - Ouagadougou');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Sofia', 'Europe - Sofia');
+VALUES ('1', 'Europe/Sofia', 'Europe - Sofia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Bahrain', 'Asia - Bahrain');
+VALUES ('1', 'Asia/Bahrain', 'Asia - Bahrain');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Bujumbura', 'Africa - Bujumbura');
+VALUES ('1', 'Africa/Bujumbura', 'Africa - Bujumbura');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Porto-Novo', 'Africa - Porto-Novo');
+VALUES ('1', 'Africa/Porto-Novo', 'Africa - Porto-Novo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Bermuda', 'Atlantic - Bermuda');
+VALUES ('1', 'Atlantic/Bermuda', 'Atlantic - Bermuda');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Brunei', 'Asia - Brunei');
+VALUES ('1', 'Asia/Brunei', 'Asia - Brunei');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/La_Paz', 'America - La Paz');
+VALUES ('1', 'America/La_Paz', 'America - La Paz');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Noronha', 'Fernando de Noronha');
+VALUES ('1', 'America/Noronha', 'Fernando de Noronha');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Belem', 'Amapa, E Para');
+VALUES ('1', 'America/Belem', 'Amapa, E Para');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Fortaleza', 'NE Brazil - Fortaleza');
+VALUES ('1', 'America/Fortaleza', 'NE Brazil - Fortaleza');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Araguaina', 'Tocantins');
+VALUES ('1', 'America/Araguaina', 'Tocantins');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Maceio', 'Alagoas, Sergipe');
+VALUES ('1', 'America/Maceio', 'Alagoas, Sergipe');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Sao_Paulo', 'S & SE Brazil - Sao Paulo');
+VALUES ('1', 'America/Sao_Paulo', 'S & SE Brazil - Sao Paulo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Cuiaba', 'Mato Grosso, Mato Grosso do Sul');
+VALUES ('1', 'America/Cuiaba', 'Mato Grosso, Mato Grosso do Sul');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Porto_Velho', 'W Para, Rondonia');
+VALUES ('1', 'America/Porto_Velho', 'W Para, Rondonia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Boa_Vista', 'Roraima');
+VALUES ('1', 'America/Boa_Vista', 'Roraima');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Manaus', 'Amazonas');
+VALUES ('1', 'America/Manaus', 'Amazonas');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Porto_Acre', 'Acre');
+VALUES ('1', 'America/Porto_Acre', 'Acre');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Nassau', 'America - Nassau');
+VALUES ('1', 'America/Nassau', 'America - Nassau');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Thimbu', 'Asia - Thimbu');
+VALUES ('1', 'Asia/Thimbu', 'Asia - Thimbu');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Gaborone', 'Africa - Gaborone');
+VALUES ('1', 'Africa/Gaborone', 'Africa - Gaborone');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Minsk', 'Europe - Minsk');
+VALUES ('1', 'Europe/Minsk', 'Europe - Minsk');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Belize', 'America - Belize');
+VALUES ('1', 'America/Belize', 'America - Belize');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/St_Johns', 'Newfoundland Island');
+VALUES ('1', 'America/St_Johns', 'Newfoundland Island');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Halifax', 'Atlantic Time - Halifax');
+VALUES ('1', 'America/Halifax', 'Atlantic Time - Halifax');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Glace_Bay', 'Atlantic Time - Glace Bay');
+VALUES ('1', 'America/Glace_Bay', 'Atlantic Time - Glace Bay');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Goose_Bay', 'Atlantic Time - East Labrador');
+VALUES ('1', 'America/Goose_Bay', 'Atlantic Time - East Labrador');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Montreal', 'Eastern Time - Montreal');
+VALUES ('1', 'America/Montreal', 'Eastern Time - Montreal');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Nipigon', 'Eastern Time - Nipigon');
+VALUES ('1', 'America/Nipigon', 'Eastern Time - Nipigon');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Thunder_Bay', 'Eastern Time - Thunder Bay');
+VALUES ('1', 'America/Thunder_Bay', 'Eastern Time - Thunder Bay');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Winnipeg', 'Central Time - Winnipeg');
+VALUES ('1', 'America/Winnipeg', 'Central Time - Winnipeg');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Rainy_River', 'Central Time - Rainy River');
+VALUES ('1', 'America/Rainy_River', 'Central Time - Rainy River');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Pangnirtung', 'Central Time - Pangnirtung');
+VALUES ('1', 'America/Pangnirtung', 'Central Time - Pangnirtung');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Iqaluit', 'Central Time - East Nunavut');
+VALUES ('1', 'America/Iqaluit', 'Central Time - East Nunavut');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Rankin_Inlet', 'Central Time - Central Nunavut');
+VALUES ('1', 'America/Rankin_Inlet', 'Central Time - Central Nunavut');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Cambridge_Bay', 'Central Time - West Nunavut');
+VALUES ('1', 'America/Cambridge_Bay', 'Central Time - West Nunavut');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Regina', 'Central Standard Time - Regina');
+VALUES ('1', 'America/Regina', 'Central Standard Time - Regina');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Swift_Current', 'Central Standard Time - Swift Current');
+VALUES ('1', 'America/Swift_Current', 'Central Standard Time - Swift Current');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Edmonton', 'Mountain Time - Edmonton');
+VALUES ('1', 'America/Edmonton', 'Mountain Time - Edmonton');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Yellowknife', 'Mountain Time - Yellowknife');
+VALUES ('1', 'America/Yellowknife', 'Mountain Time - Yellowknife');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Inuvik', 'Mountain Time - Inuvik');
+VALUES ('1', 'America/Inuvik', 'Mountain Time - Inuvik');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Dawson_Creek', 'Mountain Standard Time - Dawson Creek');
+VALUES ('1', 'America/Dawson_Creek', 'Mountain Standard Time - Dawson Creek');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Vancouver', 'Pacific Time - Vancouver');
+VALUES ('1', 'America/Vancouver', 'Pacific Time - Vancouver');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Whitehorse', 'Pacific Time - Whitehorse');
+VALUES ('1', 'America/Whitehorse', 'Pacific Time - Whitehorse');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Dawson', 'Pacific Time - Dawson');
+VALUES ('1', 'America/Dawson', 'Pacific Time - Dawson');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Cocos', 'Indian - Cocos');
+VALUES ('1', 'Indian/Cocos', 'Indian - Cocos');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Kinshasa', 'West Dem. Rep. of Congo');
+VALUES ('1', 'Africa/Kinshasa', 'West Dem. Rep. of Congo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Lubumbashi', 'East Dem. Rep. of Congo');
+VALUES ('1', 'Africa/Lubumbashi', 'East Dem. Rep. of Congo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Bangui', 'Africa - Bangui');
+VALUES ('1', 'Africa/Bangui', 'Africa - Bangui');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Brazzaville', 'Africa - Brazzaville');
+VALUES ('1', 'Africa/Brazzaville', 'Africa - Brazzaville');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Zurich', 'Europe - Zurich');
+VALUES ('1', 'Europe/Zurich', 'Europe - Zurich');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Abidjan', 'Africa - Abidjan');
+VALUES ('1', 'Africa/Abidjan', 'Africa - Abidjan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Rarotonga', 'Pacific - Rarotonga');
+VALUES ('1', 'Pacific/Rarotonga', 'Pacific - Rarotonga');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Santiago', 'America - Santiago');
+VALUES ('1', 'America/Santiago', 'America - Santiago');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Easter', 'Easter Island');
+VALUES ('1', 'Pacific/Easter', 'Easter Island');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Douala', 'Africa - Douala');
+VALUES ('1', 'Africa/Douala', 'Africa - Douala');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Harbin', 'North Manchuria');
+VALUES ('1', 'Asia/Harbin', 'North Manchuria');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Shanghai', 'China coast');
+VALUES ('1', 'Asia/Shanghai', 'China coast');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Chungking', 'China mountains');
+VALUES ('1', 'Asia/Chungking', 'China mountains');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Urumqi', 'Tibet & Xinjiang');
+VALUES ('1', 'Asia/Urumqi', 'Tibet & Xinjiang');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Kashgar', 'Eastern Turkestan');
+VALUES ('1', 'Asia/Kashgar', 'Eastern Turkestan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Bogota', 'America - Bogota');
+VALUES ('1', 'America/Bogota', 'America - Bogota');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Costa_Rica', 'America - Costa Rica');
+VALUES ('1', 'America/Costa_Rica', 'America - Costa Rica');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Havana', 'America - Havana');
+VALUES ('1', 'America/Havana', 'America - Havana');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Cape_Verde', 'Atlantic - Cape Verde');
+VALUES ('1', 'Atlantic/Cape_Verde', 'Atlantic - Cape Verde');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Christmas', 'Indian - Christmas');
+VALUES ('1', 'Indian/Christmas', 'Indian - Christmas');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Nicosia', 'Asia - Nicosia');
+VALUES ('1', 'Asia/Nicosia', 'Asia - Nicosia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Prague', 'Europe - Prague');
+VALUES ('1', 'Europe/Prague', 'Europe - Prague');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Berlin', 'Europe - Berlin');
+VALUES ('1', 'Europe/Berlin', 'Europe - Berlin');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Djibouti', 'Africa - Djibouti');
+VALUES ('1', 'Africa/Djibouti', 'Africa - Djibouti');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Copenhagen', 'Europe - Copenhagen');
+VALUES ('1', 'Europe/Copenhagen', 'Europe - Copenhagen');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Dominica', 'America - Dominica');
+VALUES ('1', 'America/Dominica', 'America - Dominica');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Santo_Domingo', 'America - Santo Domingo');
+VALUES ('1', 'America/Santo_Domingo', 'America - Santo Domingo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Algiers', 'Africa - Algiers');
+VALUES ('1', 'Africa/Algiers', 'Africa - Algiers');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Guayaquil', 'America -Guayaquil');
+VALUES ('1', 'America/Guayaquil', 'America -Guayaquil');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Galapagos', 'Galapagos Islands');
+VALUES ('1', 'Pacific/Galapagos', 'Galapagos Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Tallinn', 'Europe - Tallinn');
+VALUES ('1', 'Europe/Tallinn', 'Europe - Tallinn');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Cairo', 'Africa - Cairo');
+VALUES ('1', 'Africa/Cairo', 'Africa - Cairo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/El_Aaiun', 'Africa - El Aaiun');
+VALUES ('1', 'Africa/El_Aaiun', 'Africa - El Aaiun');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Asmera', 'Africa - Asmera');
+VALUES ('1', 'Africa/Asmera', 'Africa - Asmera');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Madrid', 'Europe - Madrid');
+VALUES ('1', 'Europe/Madrid', 'Europe - Madrid');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Ceuta', 'Ceuta & Melilla');
+VALUES ('1', 'Africa/Ceuta', 'Ceuta & Melilla');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Canary', 'Canary Islands');
+VALUES ('1', 'Atlantic/Canary', 'Canary Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Addis_Ababa', 'Africa - Addis Ababa');
+VALUES ('1', 'Africa/Addis_Ababa', 'Africa - Addis Ababa');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Helsinki', 'Europe - Helsinki');
+VALUES ('1', 'Europe/Helsinki', 'Europe - Helsinki');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Fiji', 'Pacific - Fiji');
+VALUES ('1', 'Pacific/Fiji', 'Pacific - Fiji');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Stanley', 'Atlantic - Stanley');
+VALUES ('1', 'Atlantic/Stanley', 'Atlantic - Stanley');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Yap', 'Yap');
+VALUES ('1', 'Pacific/Yap', 'Yap');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Truk', 'Truk (Chuuk)');
+VALUES ('1', 'Pacific/Truk', 'Truk (Chuuk)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Ponape', 'Ponape (Pohnpei)');
+VALUES ('1', 'Pacific/Ponape', 'Ponape (Pohnpei)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Kosrae', 'Kosrae');
+VALUES ('1', 'Pacific/Kosrae', 'Kosrae');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Faeroe', 'Atlantic - Faeroe');
+VALUES ('1', 'Atlantic/Faeroe', 'Atlantic - Faeroe');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Paris', 'Europe - Paris');
+VALUES ('1', 'Europe/Paris', 'Europe - Paris');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Libreville', 'Africa - Libreville');
+VALUES ('1', 'Africa/Libreville', 'Africa - Libreville');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/London', 'Great Britain');
+VALUES ('1', 'Europe/London', 'Great Britain');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Belfast', 'Northern Ireland');
+VALUES ('1', 'Europe/Belfast', 'Northern Ireland');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Grenada', 'America - Grenada');
+VALUES ('1', 'America/Grenada', 'America - Grenada');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Tbilisi', 'Asia - Tbilisi');
+VALUES ('1', 'Asia/Tbilisi', 'Asia - Tbilisi');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Cayenne', 'America - Cayenne');
+VALUES ('1', 'America/Cayenne', 'America - Cayenne');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Accra', 'Africa - Accra');
+VALUES ('1', 'Africa/Accra', 'Africa - Accra');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Gibraltar', 'Europe - Gibraltar');
+VALUES ('1', 'Europe/Gibraltar', 'Europe - Gibraltar');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Scoresbysund', 'East Greenland');
+VALUES ('1', 'America/Scoresbysund', 'East Greenland');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Godthab', 'Southwest Greenland');
+VALUES ('1', 'America/Godthab', 'Southwest Greenland');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Thule', 'Northwest Greenland');
+VALUES ('1', 'America/Thule', 'Northwest Greenland');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Banjul', 'Africa - Banjul');
+VALUES ('1', 'Africa/Banjul', 'Africa - Banjul');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Conakry', 'Africa - Conakry');
+VALUES ('1', 'Africa/Conakry', 'Africa - Conakry');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Guadeloupe', 'America - Guadeloupe');
+VALUES ('1', 'America/Guadeloupe', 'America - Guadeloupe');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Malabo', 'Africa - Malabo');
+VALUES ('1', 'Africa/Malabo', 'Africa - Malabo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Athens', 'Europe - Athens');
+VALUES ('1', 'Europe/Athens', 'Europe - Athens');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/South_Georgia', 'Atlantic - South Georgia');
+VALUES ('1', 'Atlantic/South_Georgia', 'Atlantic - South Georgia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Guatemala', 'America - Guatemala');
+VALUES ('1', 'America/Guatemala', 'America - Guatemala');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Guam', 'Pacific - Guam');
+VALUES ('1', 'Pacific/Guam', 'Pacific - Guam');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Bissau', 'Africa - Bissau');
+VALUES ('1', 'Africa/Bissau', 'Africa - Bissau');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Guyana', 'America - Guyana');
+VALUES ('1', 'America/Guyana', 'America - Guyana');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Hong_Kong', 'Asia - Hong Kong');
+VALUES ('1', 'Asia/Hong_Kong', 'Asia - Hong Kong');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Tegucigalpa', 'America - Tegucigalpa');
+VALUES ('1', 'America/Tegucigalpa', 'America - Tegucigalpa');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Zagreb', 'Europe - Zagreb');
+VALUES ('1', 'Europe/Zagreb', 'Europe - Zagreb');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Port-au-Prince', 'America - Port-au-Prince');
+VALUES ('1', 'America/Port-au-Prince', 'America - Port-au-Prince');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Budapest', 'Europe - Budapest');
+VALUES ('1', 'Europe/Budapest', 'Europe - Budapest');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Jakarta', 'Java & Sumatra');
+VALUES ('1', 'Asia/Jakarta', 'Java & Sumatra');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Ujung_Pandang', 'Borneo & Celebes');
+VALUES ('1', 'Asia/Ujung_Pandang', 'Borneo & Celebes');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Jayapura', 'Irian Jaya & the Moluccas');
+VALUES ('1', 'Asia/Jayapura', 'Irian Jaya & the Moluccas');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Dublin', 'Europe - Dublin');
+VALUES ('1', 'Europe/Dublin', 'Europe - Dublin');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Jerusalem', 'Asia - Jerusalem');
+VALUES ('1', 'Asia/Jerusalem', 'Asia - Jerusalem');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Calcutta', 'Asia - Calcutta');
+VALUES ('1', 'Asia/Calcutta', 'Asia - Calcutta');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Chagos', 'Indian - Chagos');
+VALUES ('1', 'Indian/Chagos', 'Indian - Chagos');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Baghdad', 'Asia - Baghdad');
+VALUES ('1', 'Asia/Baghdad', 'Asia - Baghdad');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Tehran', 'Asia - Tehran');
+VALUES ('1', 'Asia/Tehran', 'Asia - Tehran');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Reykjavik', 'Atlantic - Reykjavik');
+VALUES ('1', 'Atlantic/Reykjavik', 'Atlantic - Reykjavik');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Rome', 'Europe - Rome');
+VALUES ('1', 'Europe/Rome', 'Europe - Rome');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Jamaica', 'America - Jamaica');
+VALUES ('1', 'America/Jamaica', 'America - Jamaica');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Amman', 'Asia - Amman');
+VALUES ('1', 'Asia/Amman', 'Asia - Amman');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Tokyo', 'Asia - Tokyo');
+VALUES ('1', 'Asia/Tokyo', 'Asia - Tokyo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Nairobi', 'Africa - Nairobi');
+VALUES ('1', 'Africa/Nairobi', 'Africa - Nairobi');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Bishkek', 'Asia - Bishkek');
+VALUES ('1', 'Asia/Bishkek', 'Asia - Bishkek');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Phnom_Penh', 'Asia - Phnom Penh');
+VALUES ('1', 'Asia/Phnom_Penh', 'Asia - Phnom Penh');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Tarawa', 'Gilbert Islands');
+VALUES ('1', 'Pacific/Tarawa', 'Gilbert Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Enderbury', 'Phoenix Islands');
+VALUES ('1', 'Pacific/Enderbury', 'Phoenix Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Kiritimati', 'Line Islands');
+VALUES ('1', 'Pacific/Kiritimati', 'Line Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Comoro', 'Indian - Comoro');
+VALUES ('1', 'Indian/Comoro', 'Indian - Comoro');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/St_Kitts', 'America - St Kitts');
+VALUES ('1', 'America/St_Kitts', 'America - St Kitts');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Pyongyang', 'Asia - Pyongyang');
+VALUES ('1', 'Asia/Pyongyang', 'Asia - Pyongyang');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Seoul', 'Asia - Seoul');
+VALUES ('1', 'Asia/Seoul', 'Asia - Seoul');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Kuwait', 'Asia - Kuwait');
+VALUES ('1', 'Asia/Kuwait', 'Asia - Kuwait');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Cayman', 'America - Cayman');
+VALUES ('1', 'America/Cayman', 'America - Cayman');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Almaty', 'East Kazakhstan');
+VALUES ('1', 'Asia/Almaty', 'East Kazakhstan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Aqtobe', 'Central Kazakhstan');
+VALUES ('1', 'Asia/Aqtobe', 'Central Kazakhstan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Aqtau', 'West Kazakhstan');
+VALUES ('1', 'Asia/Aqtau', 'West Kazakhstan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Vientiane', 'Asia - Vientiane');
+VALUES ('1', 'Asia/Vientiane', 'Asia - Vientiane');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Beirut', 'Asia - Beirut');
+VALUES ('1', 'Asia/Beirut', 'Asia - Beirut');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/St_Lucia', 'America - St Lucia');
+VALUES ('1', 'America/St_Lucia', 'America - St Lucia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Vaduz', 'Europe - Vaduz');
+VALUES ('1', 'Europe/Vaduz', 'Europe - Vaduz');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Colombo', 'Asia - Colombo');
+VALUES ('1', 'Asia/Colombo', 'Asia - Colombo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Monrovia', 'Africa - Monrovia');
+VALUES ('1', 'Africa/Monrovia', 'Africa - Monrovia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Maseru', 'Africa - Maseru');
+VALUES ('1', 'Africa/Maseru', 'Africa - Maseru');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Vilnius', 'Europe - Vilnius');
+VALUES ('1', 'Europe/Vilnius', 'Europe - Vilnius');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Luxembourg', 'Europe - Luxembourg');
+VALUES ('1', 'Europe/Luxembourg', 'Europe - Luxembourg');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Riga', 'Europe - Riga');
+VALUES ('1', 'Europe/Riga', 'Europe - Riga');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Tripoli', 'Africa - Tripoli');
+VALUES ('1', 'Africa/Tripoli', 'Africa - Tripoli');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Casablanca', 'Africa - Casablanca');
+VALUES ('1', 'Africa/Casablanca', 'Africa - Casablanca');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Monaco', 'Europe - Monaco');
+VALUES ('1', 'Europe/Monaco', 'Europe - Monaco');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Chisinau', 'Europe - Chisinau');
+VALUES ('1', 'Europe/Chisinau', 'Europe - Chisinau');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Tiraspol', 'Transdniestria');
+VALUES ('1', 'Europe/Tiraspol', 'Transdniestria');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Antananarivo', 'Indian - Antananarivo');
+VALUES ('1', 'Indian/Antananarivo', 'Indian - Antananarivo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Majuro', 'Pacific - Majuro');
+VALUES ('1', 'Pacific/Majuro', 'Pacific - Majuro');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Kwajalein', 'Kwajalein');
+VALUES ('1', 'Pacific/Kwajalein', 'Kwajalein');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Skopje', 'Europe - Skopje');
+VALUES ('1', 'Europe/Skopje', 'Europe - Skopje');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Bamako', 'Southwest Mali');
+VALUES ('1', 'Africa/Bamako', 'Southwest Mali');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Timbuktu', 'Northeast Mali');
+VALUES ('1', 'Africa/Timbuktu', 'Northeast Mali');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Rangoon', 'Asia - Rangoon');
+VALUES ('1', 'Asia/Rangoon', 'Asia - Rangoon');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Ulaanbaatar', 'Asia - Ulaanbaatar');
+VALUES ('1', 'Asia/Ulaanbaatar', 'Asia - Ulaanbaatar');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Hovd', 'Bayan-Olgiy, Hovd, Uvs');
+VALUES ('1', 'Asia/Hovd', 'Bayan-Olgiy, Hovd, Uvs');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Macao', 'Asia - Macao');
+VALUES ('1', 'Asia/Macao', 'Asia - Macao');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Saipan', 'Pacific - Saipan');
+VALUES ('1', 'Pacific/Saipan', 'Pacific - Saipan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Martinique', 'America - Martinique');
+VALUES ('1', 'America/Martinique', 'America - Martinique');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Nouakchott', 'Africa - Nouakchott');
+VALUES ('1', 'Africa/Nouakchott', 'Africa - Nouakchott');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Montserrat', 'America - Montserrat');
+VALUES ('1', 'America/Montserrat', 'America - Montserrat');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Malta', 'Europe - Malta');
+VALUES ('1', 'Europe/Malta', 'Europe - Malta');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Mauritius', 'Indian - Mauritius');
+VALUES ('1', 'Indian/Mauritius', 'Indian - Mauritius');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Maldives', 'Indian - Maldives');
+VALUES ('1', 'Indian/Maldives', 'Indian - Maldives');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Blantyre', 'Africa - Blantyre');
+VALUES ('1', 'Africa/Blantyre', 'Africa - Blantyre');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Mexico_City', 'Central Time - Mexico City');
+VALUES ('1', 'America/Mexico_City', 'Central Time - Mexico City');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Cancun', 'Central Time - Quintana Roo');
+VALUES ('1', 'America/Cancun', 'Central Time - Quintana Roo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Mazatlan', 'Mountain Time - Mazatlna');
+VALUES ('1', 'America/Mazatlan', 'Mountain Time - Mazatlna');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Chihuahua', 'Mountain Time - Chihuahua');
+VALUES ('1', 'America/Chihuahua', 'Mountain Time - Chihuahua');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Hermosillo', 'Mountain Standard Time - Sonora');
+VALUES ('1', 'America/Hermosillo', 'Mountain Standard Time - Sonora');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Tijuana', 'Pacific Time - Tijuana');
+VALUES ('1', 'America/Tijuana', 'Pacific Time - Tijuana');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Kuala_Lumpur', 'Peninsular Malaysia');
+VALUES ('1', 'Asia/Kuala_Lumpur', 'Peninsular Malaysia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Kuching', 'Sabah & Sarawak');
+VALUES ('1', 'Asia/Kuching', 'Sabah & Sarawak');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Maputo', 'Africa - Maputo');
+VALUES ('1', 'Africa/Maputo', 'Africa - Maputo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Windhoek', 'Africa - Windhoek');
+VALUES ('1', 'Africa/Windhoek', 'Africa - Windhoek');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Noumea', 'Pacific - Noumea');
+VALUES ('1', 'Pacific/Noumea', 'Pacific - Noumea');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Niamey', 'Africa - Niamey');
+VALUES ('1', 'Africa/Niamey', 'Africa - Niamey');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Norfolk', 'Pacific - Norfolk');
+VALUES ('1', 'Pacific/Norfolk', 'Pacific - Norfolk');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Lagos', 'Africa - Lagos');
+VALUES ('1', 'Africa/Lagos', 'Africa - Lagos');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Managua', 'America - Managua');
+VALUES ('1', 'America/Managua', 'America - Managua');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Amsterdam', 'Europe - Amsterdam');
+VALUES ('1', 'Europe/Amsterdam', 'Europe - Amsterdam');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Oslo', 'Europe - Oslo');
+VALUES ('1', 'Europe/Oslo', 'Europe - Oslo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Katmandu', 'Asia - Katmandu');
+VALUES ('1', 'Asia/Katmandu', 'Asia - Katmandu');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Nauru', 'Pacific - Nauru');
+VALUES ('1', 'Pacific/Nauru', 'Pacific - Nauru');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Niue', 'Pacific - Niue');
+VALUES ('1', 'Pacific/Niue', 'Pacific - Niue');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Auckland', 'Pacific - Auckland');
+VALUES ('1', 'Pacific/Auckland', 'Pacific - Auckland');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Chatham', 'Chatham Islands');
+VALUES ('1', 'Pacific/Chatham', 'Chatham Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Muscat', 'Asia - Muscat');
+VALUES ('1', 'Asia/Muscat', 'Asia - Muscat');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Panama', 'America - Panama');
+VALUES ('1', 'America/Panama', 'America - Panama');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Lima', 'America - Lima');
+VALUES ('1', 'America/Lima', 'America - Lima');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Tahiti', 'Society Islands');
+VALUES ('1', 'Pacific/Tahiti', 'Society Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Marquesas', 'Marquesas Islands');
+VALUES ('1', 'Pacific/Marquesas', 'Marquesas Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Gambier', 'Gambier Islands');
+VALUES ('1', 'Pacific/Gambier', 'Gambier Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Port_Moresby', 'Pacific - Port Moresby');
+VALUES ('1', 'Pacific/Port_Moresby', 'Pacific - Port Moresby');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Manila', 'Asia - Manila');
+VALUES ('1', 'Asia/Manila', 'Asia - Manila');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Karachi', 'Asia - Karachi');
+VALUES ('1', 'Asia/Karachi', 'Asia - Karachi');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Warsaw', 'Europe - Warsaw');
+VALUES ('1', 'Europe/Warsaw', 'Europe - Warsaw');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Miquelon', 'America - Miquelon');
+VALUES ('1', 'America/Miquelon', 'America - Miquelon');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Pitcairn', 'Pacific - Pitcairn');
+VALUES ('1', 'Pacific/Pitcairn', 'Pacific - Pitcairn');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Puerto_Rico', 'America - Puerto Rico');
+VALUES ('1', 'America/Puerto_Rico', 'America - Puerto Rico');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Gaza', 'Asia - Gaza');
+VALUES ('1', 'Asia/Gaza', 'Asia - Gaza');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Lisbon', 'Europe - Lisbon');
+VALUES ('1', 'Europe/Lisbon', 'Europe - Lisbon');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Madeira', 'Madeira Islands');
+VALUES ('1', 'Atlantic/Madeira', 'Madeira Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Azores', 'Azores');
+VALUES ('1', 'Atlantic/Azores', 'Azores');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Palau', 'Pacific - Palau');
+VALUES ('1', 'Pacific/Palau', 'Pacific - Palau');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Asuncion', 'America - Asuncion');
+VALUES ('1', 'America/Asuncion', 'America - Asuncion');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Qatar', 'Asia - Qatar');
+VALUES ('1', 'Asia/Qatar', 'Asia - Qatar');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Reunion', 'Indian - Reunion');
+VALUES ('1', 'Indian/Reunion', 'Indian - Reunion');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Bucharest', 'Europe - Bucharest');
+VALUES ('1', 'Europe/Bucharest', 'Europe - Bucharest');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Kaliningrad', 'Moscow-01 - Kaliningrad');
+VALUES ('1', 'Europe/Kaliningrad', 'Moscow-01 - Kaliningrad');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Moscow', 'Moscow+00 - west Russia');
+VALUES ('1', 'Europe/Moscow', 'Moscow+00 - west Russia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Samara', 'Moscow+01 - Caspian Sea');
+VALUES ('1', 'Europe/Samara', 'Moscow+01 - Caspian Sea');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Yekaterinburg', 'Moscow+02 - Urals');
+VALUES ('1', 'Asia/Yekaterinburg', 'Moscow+02 - Urals');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Omsk', 'Moscow+03 - west Siberia');
+VALUES ('1', 'Asia/Omsk', 'Moscow+03 - west Siberia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Novosibirsk', 'Moscow+03 - Novosibirsk');
+VALUES ('1', 'Asia/Novosibirsk', 'Moscow+03 - Novosibirsk');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Krasnoyarsk', 'Moscow+04 - Yenisei River');
+VALUES ('1', 'Asia/Krasnoyarsk', 'Moscow+04 - Yenisei River');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Irkutsk', 'Moscow+05 - Lake Baikal');
+VALUES ('1', 'Asia/Irkutsk', 'Moscow+05 - Lake Baikal');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Yakutsk', 'Moscow+06 - Lena River');
+VALUES ('1', 'Asia/Yakutsk', 'Moscow+06 - Lena River');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Vladivostok', 'Moscow+07 - Amur River');
+VALUES ('1', 'Asia/Vladivostok', 'Moscow+07 - Amur River');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Magadan', 'Moscow+08 - Magadan & Sakhalin');
+VALUES ('1', 'Asia/Magadan', 'Moscow+08 - Magadan & Sakhalin');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Kamchatka', 'Moscow+09 - Kamchatka');
+VALUES ('1', 'Asia/Kamchatka', 'Moscow+09 - Kamchatka');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Anadyr', 'Moscow+10 - Bering Sea');
+VALUES ('1', 'Asia/Anadyr', 'Moscow+10 - Bering Sea');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Kigali', 'Africa - Kigali');
+VALUES ('1', 'Africa/Kigali', 'Africa - Kigali');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Riyadh', 'Asia - Riyadh');
+VALUES ('1', 'Asia/Riyadh', 'Asia - Riyadh');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Guadalcanal', 'Pacific - Guadalcanal');
+VALUES ('1', 'Pacific/Guadalcanal', 'Pacific - Guadalcanal');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Mahe', 'Indian - Mahe');
+VALUES ('1', 'Indian/Mahe', 'Indian - Mahe');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Khartoum', 'Africa - Khartoum');
+VALUES ('1', 'Africa/Khartoum', 'Africa - Khartoum');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Stockholm', 'Europe - Stockholm');
+VALUES ('1', 'Europe/Stockholm', 'Europe - Stockholm');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Singapore', 'Asia - Singapore');
+VALUES ('1', 'Asia/Singapore', 'Asia - Singapore');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/St_Helena', 'Atlantic - St Helena');
+VALUES ('1', 'Atlantic/St_Helena', 'Atlantic - St Helena');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Ljubljana', 'Europe - Ljubljana');
+VALUES ('1', 'Europe/Ljubljana', 'Europe - Ljubljana');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Arctic/Longyearbyen', 'Svalbard');
+VALUES ('1', 'Arctic/Longyearbyen', 'Svalbard');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Atlantic/Jan_Mayen', 'Jan Mayen');
+VALUES ('1', 'Atlantic/Jan_Mayen', 'Jan Mayen');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Bratislava', 'Europe - Bratislava');
+VALUES ('1', 'Europe/Bratislava', 'Europe - Bratislava');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Freetown', 'Africa - Freetown');
+VALUES ('1', 'Africa/Freetown', 'Africa - Freetown');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/San_Marino', 'Europe - San Marino');
+VALUES ('1', 'Europe/San_Marino', 'Europe - San Marino');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Dakar', 'Africa - Dakar');
+VALUES ('1', 'Africa/Dakar', 'Africa - Dakar');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Mogadishu', 'Africa - Mogadishu');
+VALUES ('1', 'Africa/Mogadishu', 'Africa - Mogadishu');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Paramaribo', 'America - Paramaribo');
+VALUES ('1', 'America/Paramaribo', 'America - Paramaribo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Sao_Tome', 'Africa - Sao Tome');
+VALUES ('1', 'Africa/Sao_Tome', 'Africa - Sao Tome');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/El_Salvador', 'America - El Salvador');
+VALUES ('1', 'America/El_Salvador', 'America - El Salvador');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Damascus', 'Asia - Damascus');
+VALUES ('1', 'Asia/Damascus', 'Asia - Damascus');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Mbabane', 'Africa - Mbabane');
+VALUES ('1', 'Africa/Mbabane', 'Africa - Mbabane');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Grand_Turk', 'America - Grand Turk');
+VALUES ('1', 'America/Grand_Turk', 'America - Grand Turk');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Ndjamena', 'Africa - Ndjamena');
+VALUES ('1', 'Africa/Ndjamena', 'Africa - Ndjamena');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Kerguelen', 'Indian - Kerguelen');
+VALUES ('1', 'Indian/Kerguelen', 'Indian - Kerguelen');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Lome', 'Africa - Lome');
+VALUES ('1', 'Africa/Lome', 'Africa - Lome');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Bangkok', 'Asia - Bangkok');
+VALUES ('1', 'Asia/Bangkok', 'Asia - Bangkok');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Dushanbe', 'Asia - Dushanbe');
+VALUES ('1', 'Asia/Dushanbe', 'Asia - Dushanbe');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Fakaofo', 'Pacific - Fakaofo');
+VALUES ('1', 'Pacific/Fakaofo', 'Pacific - Fakaofo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Ashkhabad', 'Asia - Ashkhabad');
+VALUES ('1', 'Asia/Ashkhabad', 'Asia - Ashkhabad');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Tunis', 'Africa - Tunis');
+VALUES ('1', 'Africa/Tunis', 'Africa - Tunis');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Tongatapu', 'Pacific - Tongatapu');
+VALUES ('1', 'Pacific/Tongatapu', 'Pacific - Tongatapu');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Dili', 'Asia - Dili');
+VALUES ('1', 'Asia/Dili', 'Asia - Dili');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Istanbul', 'Europe - Istanbul');
+VALUES ('1', 'Europe/Istanbul', 'Europe - Istanbul');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Port_of_Spain', 'America - Port of Spain');
+VALUES ('1', 'America/Port_of_Spain', 'America - Port of Spain');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Funafuti', 'Pacific - Funafuti');
+VALUES ('1', 'Pacific/Funafuti', 'Pacific - Funafuti');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Taipei', 'Asia - Taipei');
+VALUES ('1', 'Asia/Taipei', 'Asia - Taipei');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Dar_es_Salaam', 'Africa - Dar es Salaam');
+VALUES ('1', 'Africa/Dar_es_Salaam', 'Africa - Dar es Salaam');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Kiev', 'Europe - Kiev');
+VALUES ('1', 'Europe/Kiev', 'Europe - Kiev');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Uzhgorod', 'Ruthenia');
+VALUES ('1', 'Europe/Uzhgorod', 'Ruthenia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Zaporozhye', 'Zaporozh''ye, E Lugansk');
+VALUES ('1', 'Europe/Zaporozhye', 'Zaporozh''ye, E Lugansk');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Simferopol', 'Central Crimea');
+VALUES ('1', 'Europe/Simferopol', 'Central Crimea');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Kampala', 'Africa - Kampala');
+VALUES ('1', 'Africa/Kampala', 'Africa - Kampala');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Johnston', 'Johnston Atoll');
+VALUES ('1', 'Pacific/Johnston', 'Johnston Atoll');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Midway', 'Midway Islands');
+VALUES ('1', 'Pacific/Midway', 'Midway Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Wake', 'Wake Island');
+VALUES ('1', 'Pacific/Wake', 'Wake Island');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/New_York', 'Eastern Time');
+VALUES ('1', 'America/New_York', 'Eastern Time');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Detroit', 'Eastern Time - Detroit');
+VALUES ('1', 'America/Detroit', 'Eastern Time - Detroit');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Louisville', 'Eastern Time - Louisville, KY');
+VALUES ('1', 'America/Louisville', 'Eastern Time - Louisville, KY');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Indianapolis', 'Eastern Standard Time - Indianapolis');
+VALUES ('1', 'America/Indianapolis', 'Eastern Standard Time - Indianapolis');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Indiana/Marengo', 'Eastern Standard Time - Marengo, IN');
+VALUES ('1', 'America/Indiana/Marengo', 'Eastern Standard Time - Marengo, IN');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Indiana/Knox', 'Eastern Standard Time - Knox, IN');
+VALUES ('1', 'America/Indiana/Knox', 'Eastern Standard Time - Knox, IN');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Indiana/Vevay', 'Eastern Standard Time - Vevay, IN');
+VALUES ('1', 'America/Indiana/Vevay', 'Eastern Standard Time - Vevay, IN');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Chicago', 'Central Time - Chicago');
+VALUES ('1', 'America/Chicago', 'Central Time - Chicago');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Menominee', 'Central Time - Menominee');
+VALUES ('1', 'America/Menominee', 'Central Time - Menominee');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Denver', 'Mountain Time - Denver');
+VALUES ('1', 'America/Denver', 'Mountain Time - Denver');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Boise', 'Mountain Time - Boise');
+VALUES ('1', 'America/Boise', 'Mountain Time - Boise');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Shiprock', 'Mountain Time - Navajo');
+VALUES ('1', 'America/Shiprock', 'Mountain Time - Navajo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Phoenix', 'Mountain Standard Time - Arizona');
+VALUES ('1', 'America/Phoenix', 'Mountain Standard Time - Arizona');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Los_Angeles', 'Pacific Time - Los Angeles');
+VALUES ('1', 'America/Los_Angeles', 'Pacific Time - Los Angeles');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Anchorage', 'Alaska Time');
+VALUES ('1', 'America/Anchorage', 'Alaska Time');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Juneau', 'Alaska Time - Juneau');
+VALUES ('1', 'America/Juneau', 'Alaska Time - Juneau');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Yakutat', 'Alaska Time - Yakutat');
+VALUES ('1', 'America/Yakutat', 'Alaska Time - Yakutat');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Nome', 'Alaska Time - Nome');
+VALUES ('1', 'America/Nome', 'Alaska Time - Nome');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Adak', 'Aleutian Islands');
+VALUES ('1', 'America/Adak', 'Aleutian Islands');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Honolulu', 'Hawaii');
+VALUES ('1', 'Pacific/Honolulu', 'Hawaii');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Montevideo', 'America - Montevideo');
+VALUES ('1', 'America/Montevideo', 'America - Montevideo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Samarkand', 'West Uzbekistan');
+VALUES ('1', 'Asia/Samarkand', 'West Uzbekistan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Tashkent', 'East Uzbekistan');
+VALUES ('1', 'Asia/Tashkent', 'East Uzbekistan');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Vatican', 'Europe - Vatican');
+VALUES ('1', 'Europe/Vatican', 'Europe - Vatican');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/St_Vincent', 'America - St Vincent');
+VALUES ('1', 'America/St_Vincent', 'America - St Vincent');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Caracas', 'America - Caracas');
+VALUES ('1', 'America/Caracas', 'America - Caracas');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/Tortola', 'America - Tortola');
+VALUES ('1', 'America/Tortola', 'America - Tortola');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'America/St_Thomas', 'America - St Thomas');
+VALUES ('1', 'America/St_Thomas', 'America - St Thomas');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Saigon', 'Asia - Saigon');
+VALUES ('1', 'Asia/Saigon', 'Asia - Saigon');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Efate', 'Pacific - Efate');
+VALUES ('1', 'Pacific/Efate', 'Pacific - Efate');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Wallis', 'Pacific - Wallis');
+VALUES ('1', 'Pacific/Wallis', 'Pacific - Wallis');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Pacific/Apia', 'Pacific - Apia');
+VALUES ('1', 'Pacific/Apia', 'Pacific - Apia');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Asia/Aden', 'Asia - Aden');
+VALUES ('1', 'Asia/Aden', 'Asia - Aden');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Indian/Mayotte', 'Indian - Mayotte');
+VALUES ('1', 'Indian/Mayotte', 'Indian - Mayotte');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Europe/Belgrade', 'Europe - Belgrade');
+VALUES ('1', 'Europe/Belgrade', 'Europe - Belgrade');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Johannesburg', 'Africa - Johannesburg');
+VALUES ('1', 'Africa/Johannesburg', 'Africa - Johannesburg');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Lusaka', 'Africa - Lusaka');
+VALUES ('1', 'Africa/Lusaka', 'Africa - Lusaka');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (1, 'Africa/Harare', 'Africa - Harare');
+VALUES ('1', 'Africa/Harare', 'Africa - Harare');
 
 --
 -- NAME FORMATTING
 --
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (2, 'List Name Format', 'How people''s names appear in lists.', '%l%, f', \
'%l%, f', 0, 'select'); +VALUES ('2', 'List Name Format', 'How people''s names appear \
in lists.', '%l%, f', '%l%, f', '0', 'select');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (402, 22, 48, 1);
+VALUES ('402', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (2, 2, 402); 
+VALUES ('2', '2', '402'); 
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%l%, f% m', '"Clinton, William Jefferson"');
+VALUES ('2', '%l%, f% m', '"Clinton, William Jefferson"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%l%, f% M', '"Clinton, William J."');
+VALUES ('2', '%l%, f% M', '"Clinton, William J."');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%l%, f', '"Clinton, William"');
+VALUES ('2', '%l%, f', '"Clinton, William"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%l%, F%M', '"Clinton, W.J."');
+VALUES ('2', '%l%, F%M', '"Clinton, W.J."');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%l%, F% m', '"Clinton, W. Jefferson"');
+VALUES ('2', '%l%, F% m', '"Clinton, W. Jefferson"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%f% m% l', '"William Jefferson Clinton"');
+VALUES ('2', '%f% m% l', '"William Jefferson Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%f% l', '"William Clinton"');
+VALUES ('2', '%f% l', '"William Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%f% M% l', '"William J. Clinton"');
+VALUES ('2', '%f% M% l', '"William J. Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%F%M% l', '"W.J. Clinton"');
+VALUES ('2', '%F%M% l', '"W.J. Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (2, '%F% m% l', '"W. Jefferson Clinton"');
+VALUES ('2', '%F% m% l', '"W. Jefferson Clinton"');
 
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (3, 'Name Format', 'The default format for people''s names.', '%f% l', '%f% \
l', 0, 'select'); +VALUES ('3', 'Name Format', 'The default format for people''s \
names.', '%f% l', '%f% l', '0', 'select');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (403, 22, 48, 1);
+VALUES ('403', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (3, 3, 403); 
+VALUES ('3', '3', '403'); 
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%l%, f% m', '"Clinton, William Jefferson"');
+VALUES ('3', '%l%, f% m', '"Clinton, William Jefferson"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%l%, f% M', '"Clinton, William J."');
+VALUES ('3', '%l%, f% M', '"Clinton, William J."');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%l%, f', '"Clinton, William"');
+VALUES ('3', '%l%, f', '"Clinton, William"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%l%, F%M', '"Clinton, W.J."');
+VALUES ('3', '%l%, F%M', '"Clinton, W.J."');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%l%, F% m', '"Clinton, W. Jefferson"');
+VALUES ('3', '%l%, F% m', '"Clinton, W. Jefferson"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%f% m% l', '"William Jefferson Clinton"');
+VALUES ('3', '%f% m% l', '"William Jefferson Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%f% l', '"William Clinton"');
+VALUES ('3', '%f% l', '"William Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%f% M% l', '"William J. Clinton"');
+VALUES ('3', '%f% M% l', '"William J. Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%F%M% l', '"W.J. Clinton"');
+VALUES ('3', '%F%M% l', '"W.J. Clinton"');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (3, '%F% m% l', '"W. Jefferson Clinton"');
+VALUES ('3', '%F% m% l', '"W. Jefferson Clinton"');
 
 -- Date and time formatting.
 
 INSERT INTO pref (id, name, description, value, def, opt_type)
-VALUES (5, 'Date/Time Format', 'How dates and times are displayed.', '%Y-%m-%d %T', \
'%Y-%m-%d %T', 'select'); +VALUES ('5', 'Date/Time Format', 'How dates and times are \
displayed.', '%Y-%m-%d %T', '%Y-%m-%d %T', 'select');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (405, 22, 48, 1);
+VALUES ('405', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (5, 5, 405); 
+VALUES ('5', '5', '405'); 
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%Y-%m-%d %T', 'ISO-8601 Compliant (CCYY-MM-DD hh:mm:ss)');
+VALUES ('5', '%Y-%m-%d %T', 'ISO-8601 Compliant (CCYY-MM-DD hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%Y-%m-%d %T.%3N', 'ISO-8601 Compliant with miliseconds (CCYY-MM-DD \
hh:mm:ss.000)'); +VALUES ('5', '%Y-%m-%d %T.%3N', 'ISO-8601 Compliant with \
miliseconds (CCYY-MM-DD hh:mm:ss.000)');  
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%Y-%m-%d %T.%6N', 'ISO-8601 Compliant with microseconds (CCYY-MM-DD \
hh:mm:ss.000000)'); +VALUES ('5', '%Y-%m-%d %T.%6N', 'ISO-8601 Compliant with \
microseconds (CCYY-MM-DD hh:mm:ss.000000)');  
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%Y-%m-%dT%T', 'ISO-8601 Strict (CCYY-MM-DDThh:mm:ss)');
+VALUES ('5', '%Y-%m-%dT%T', 'ISO-8601 Strict (CCYY-MM-DDThh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%Y-%m-%dT%T.%3N', 'ISO-8601 Strict with miliseconds \
(CCYY-MM-DDThh:mm:ss.000)'); +VALUES ('5', '%Y-%m-%dT%T.%3N', 'ISO-8601 Strict with \
miliseconds (CCYY-MM-DDThh:mm:ss.000)');  
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%Y-%m-%dT%T.%6N', 'ISO-8601 Strict with microseconds \
(CCYY-MM-DDThh:mm:ss.000000)'); +VALUES ('5', '%Y-%m-%dT%T.%6N', 'ISO-8601 Strict \
with microseconds (CCYY-MM-DDThh:mm:ss.000000)');  
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%m/%d/%Y %T', 'U.S. (MM/DD/CCYY hh:mm:ss)');
+VALUES ('5', '%m/%d/%Y %T', 'U.S. (MM/DD/CCYY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%m/%d/%Y', 'U.S. Date Only (MM/DD/CCYY)');
+VALUES ('5', '%m/%d/%Y', 'U.S. Date Only (MM/DD/CCYY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%m/%d/%y %T', 'U.S. Short (MM/DD/YY hh:mm:ss)');
+VALUES ('5', '%m/%d/%y %T', 'U.S. Short (MM/DD/YY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%m/%d/%y', 'U.S. Short Date Only (MM/DD/YY)');
+VALUES ('5', '%m/%d/%y', 'U.S. Short Date Only (MM/DD/YY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%B %d, %Y %T', 'U.S. Long (Month DD, CCYY hh:mm:ss)');
+VALUES ('5', '%B %d, %Y %T', 'U.S. Long (Month DD, CCYY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%b %d, %Y %T', 'U.S. Long Abbrev. (Mon DD, CCYY hh:mm:ss)');
+VALUES ('5', '%b %d, %Y %T', 'U.S. Long Abbrev. (Mon DD, CCYY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%B %d, %Y', 'U.S. Long Date Only (Month DD, CCYY)');
+VALUES ('5', '%B %d, %Y', 'U.S. Long Date Only (Month DD, CCYY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%b %d, %Y', 'U.S. Long Abbrev. Date Only (Mon DD, CCYY)');
+VALUES ('5', '%b %d, %Y', 'U.S. Long Abbrev. Date Only (Mon DD, CCYY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d/%m/%Y %T', 'European (DD/MM/CCYY hh:mm:ss)');
+VALUES ('5', '%d/%m/%Y %T', 'European (DD/MM/CCYY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d/%m/%Y', 'European Date Only (DD/MM/CCYY)');
+VALUES ('5', '%d/%m/%Y', 'European Date Only (DD/MM/CCYY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d/%m/%y %T', 'European Short (DD/MM/YY hh:mm:ss)');
+VALUES ('5', '%d/%m/%y %T', 'European Short (DD/MM/YY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d/%m/%y', 'European Short Date Only (DD/MM/YY)');
+VALUES ('5', '%d/%m/%y', 'European Short Date Only (DD/MM/YY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d %B %Y %T', 'European Long (DD Month CCYY hh:mm:ss)');
+VALUES ('5', '%d %B %Y %T', 'European Long (DD Month CCYY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d %b %Y %T', 'European Long Abbrev. (DD Mon CCYY hh:mm:ss)');
+VALUES ('5', '%d %b %Y %T', 'European Long Abbrev. (DD Mon CCYY hh:mm:ss)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d %B, %Y', 'European Long Date Only (DD Month CCYY)');
+VALUES ('5', '%d %B, %Y', 'European Long Date Only (DD Month CCYY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, '%d %b, %Y', 'European Long Abbrev. Date Only (DD Mon CCYY)');
+VALUES ('5', '%d %b, %Y', 'European Long Abbrev. Date Only (DD Mon CCYY)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (5, 'epoch', 'Epoch Time (Seconds since 1970-01-01 00:00:00)');
+VALUES ('5', 'epoch', 'Epoch Time (Seconds since 1970-01-01 00:00:00)');
 
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (6, 'Permissions Widget', 'Permissions Widget', 'radio', 'radio', 0, \
'radio'); +VALUES ('6', 'Permissions Widget', 'Permissions Widget', 'radio', 'radio', \
'0', 'radio');  
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (156, 22, 48, 1);
+VALUES ('156', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (6, 6, 156); 
+VALUES ('6', '6', '156'); 
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (6, 'radio', 'Radio Buttons');
+VALUES ('6', 'radio', 'Radio Buttons');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (6, 'select', 'Select List');
+VALUES ('6', 'select', 'Select List');
 
 
 -- Search Paging
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
 VALUES ('10', 'Search Results / Page',
         'Controls the number of records displayed per page from searches',
-        0, 0, 0, 'select');
+        '0', '0', '0', 'select');
 
-INSERT INTO member (id, grp__id, class__id, active) VALUES (167, 22, 48, 1);
+INSERT INTO member (id, grp__id, class__id, active) VALUES ('167', '22', '48', '1');
 
-INSERT INTO pref_member (id, object_id, member__id) VALUES (10, 10, 167);
+INSERT INTO pref_member (id, object_id, member__id) VALUES ('10', '10', '167');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (10, '0', 'Off');
+VALUES ('10', '0', 'Off');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (10, '10', '10');
+VALUES ('10', '10', '10');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (10, '20', '20');
+VALUES ('10', '20', '20');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (10, '30', '30');
+VALUES ('10', '30', '30');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (10, '40', '40');
+VALUES ('10', '40', '40');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (10, '50', '50');
+VALUES ('10', '50', '50');
 
 
 -- Bricolage Instance Name
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
 VALUES ('11', 'Bricolage Instance Name',
         'Label used in window titles and the Welcome to Bricolage message on the \
                login page.',
-        'Bricolage', 'Bricolage', 1, 'text');
+        'Bricolage', 'Bricolage', '1', 'text');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (168, 22, 48, 1);
+VALUES ('168', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (11, 11, 168); 
+VALUES ('11', '11', '168'); 
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (11, 'Bricolage', 'Bricolage');
+VALUES ('11', 'Bricolage', 'Bricolage');
 
 
 -- Default Advanced Search
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (12, 'Default Search',
+VALUES ('12', 'Default Search',
         'Whether Find Media and Find Stories use Simple or Advanced Search by \
                default.',
-        '0', '0', 0, 'select');
+        '0', '0', '0', 'select');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (169, 22, 48, 1);
+VALUES ('169', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (12, 12, 169);
+VALUES ('12', '12', '169');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (12, '0', 'Simple');
+VALUES ('12', '0', 'Simple');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (12, '1', 'Advanced');
+VALUES ('12', '1', 'Advanced');
 
 
 -- Default Asset Sort
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (13, 'Default Asset Sort',
+VALUES ('13', 'Default Asset Sort',
         'The default Story/Media field to sort on.',
-        'cover_date', 'cover_date', 0, 'select');
+        'cover_date', 'cover_date', '0', 'select');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (170, 22, 48, 1);
+VALUES ('170', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (13, 13, 170);
+VALUES ('13', '13', '170');
 
 -- Note: change these if $sort_by in comp/widgets/desk/desk_top.html changes
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'cover_date', 'Cover Date');
+VALUES ('13', 'cover_date', 'Cover Date');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'priority', 'Priority');
+VALUES ('13', 'priority', 'Priority');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'name', 'Title');
+VALUES ('13', 'name', 'Title');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'category_name', 'Category');
+VALUES ('13', 'category_name', 'Category');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'site_id', 'Site');
+VALUES ('13', 'site_id', 'Site');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'element', 'Media Type');
+VALUES ('13', 'element', 'Media Type');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (13, 'id', 'ID');
+VALUES ('13', 'id', 'ID');
 
 
 -- Character Set
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (14, 'Character Set',
+VALUES ('14', 'Character Set',
         'The default character set to use for display.',
-        'UTF-8', 'UTF-8', 0, 'select');
+        'UTF-8', 'UTF-8', '0', 'select');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (900, 22, 48, 1);
+VALUES ('900', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (14, 14, 900);
+VALUES ('14', '14', '900');
 
 -- These values were hand-picked from Encode::Supported
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'UTF-8', 'UTF-8');
+VALUES ('14', 'UTF-8', 'UTF-8');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-1', 'ISO-8859-1');
+VALUES ('14', 'iso-8859-1', 'ISO-8859-1');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-2', 'ISO-8859-2');
+VALUES ('14', 'iso-8859-2', 'ISO-8859-2');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-3', 'ISO-8859-3');
+VALUES ('14', 'iso-8859-3', 'ISO-8859-3');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-4', 'ISO-8859-4');
+VALUES ('14', 'iso-8859-4', 'ISO-8859-4');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-5', 'ISO-8859-5');
+VALUES ('14', 'iso-8859-5', 'ISO-8859-5');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-6', 'ISO-8859-6');
+VALUES ('14', 'iso-8859-6', 'ISO-8859-6');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-7', 'ISO-8859-7');
+VALUES ('14', 'iso-8859-7', 'ISO-8859-7');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-8', 'ISO-8859-8');
+VALUES ('14', 'iso-8859-8', 'ISO-8859-8');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-9', 'ISO-8859-9');
+VALUES ('14', 'iso-8859-9', 'ISO-8859-9');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-10', 'ISO-8859-10');
+VALUES ('14', 'iso-8859-10', 'ISO-8859-10');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-11', 'ISO-8859-11');
+VALUES ('14', 'iso-8859-11', 'ISO-8859-11');
 
 -- There is no ISO-8859-12
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-13', 'ISO-8859-13');
+VALUES ('14', 'iso-8859-13', 'ISO-8859-13');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-14', 'ISO-8859-14');
+VALUES ('14', 'iso-8859-14', 'ISO-8859-14');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-15', 'ISO-8859-15');
+VALUES ('14', 'iso-8859-15', 'ISO-8859-15');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-8859-16', 'ISO-8859-16');
+VALUES ('14', 'iso-8859-16', 'ISO-8859-16');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'viscii', 'Viscii (Vietnamese)');
+VALUES ('14', 'viscii', 'Viscii (Vietnamese)');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'gb-2312', 'GB-2312');
+VALUES ('14', 'gb-2312', 'GB-2312');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'Big5', 'Big5');
+VALUES ('14', 'Big5', 'Big5');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'euc-jp', 'EUC-JP');
+VALUES ('14', 'euc-jp', 'EUC-JP');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'shiftjis', 'ShiftJIS');
+VALUES ('14', 'shiftjis', 'ShiftJIS');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-2022-jp', 'ISO-2022-JP');
+VALUES ('14', 'iso-2022-jp', 'ISO-2022-JP');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'euc-kr', 'EUC-KR');
+VALUES ('14', 'euc-kr', 'EUC-KR');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'iso-2022-kr', 'ISO-2022-KR');
+VALUES ('14', 'iso-2022-kr', 'ISO-2022-KR');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'koi8-r', 'KOI8-R');
+VALUES ('14', 'koi8-r', 'KOI8-R');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (14, 'koi8-u', 'KOI8-U');
+VALUES ('14', 'koi8-u', 'KOI8-U');
 
 -- Language
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (15, 'Language',
+VALUES ('15', 'Language',
         'The default language to use for display.',
-        'en_us', 'en_us', 0, 'select');
+        'en_us', 'en_us', '0', 'select');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (901, 22, 48, 1);
+VALUES ('901', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (15, 15, 901);
+VALUES ('15', '15', '901');
 
 -- These values are based on the current localizations offered
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'en_us', 'en_us');
+VALUES ('15', 'en_us', 'en_us');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'de_de', 'de_de');
+VALUES ('15', 'de_de', 'de_de');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'it_it', 'it_it');
+VALUES ('15', 'it_it', 'it_it');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'pt_pt', 'pt_pt');
+VALUES ('15', 'pt_pt', 'pt_pt');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'zh_tw', 'zh_tw');
+VALUES ('15', 'zh_tw', 'zh_tw');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'zh_cn', 'zh_cn');
+VALUES ('15', 'zh_cn', 'zh_cn');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'zh_hk', 'zh_hk');
+VALUES ('15', 'zh_hk', 'zh_hk');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'bo', 'bo');
+VALUES ('15', 'bo', 'bo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'km', 'km');
+VALUES ('15', 'km', 'km');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'ko_ko', 'ko_ko');
+VALUES ('15', 'ko_ko', 'ko_ko');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'lo', 'lo');
+VALUES ('15', 'lo', 'lo');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'my', 'my');
+VALUES ('15', 'my', 'my');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'ug', 'ug');
+VALUES ('15', 'ug', 'ug');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (15, 'vi_vn', 'vi_vn');
+VALUES ('15', 'vi_vn', 'vi_vn');
 
 -- Filter search results by site
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (16, 'Filter by Site Context',
+VALUES ('16', 'Filter by Site Context',
         'Filter search results by the site context.',
-        '0', '0', 0, 'select');
+        '0', '0', '0', 'select');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (902, 22, 48, 1);
+VALUES ('902', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (16, 16, 902);
+VALUES ('16', '16', '902');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (16, '0', 'Off');
+VALUES ('16', '0', 'Off');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (16, '1', 'On');
+VALUES ('16', '1', 'On');
 
 -- Show/hide alpha search links
 
 INSERT INTO pref (id, name, description, value, def, manual, opt_type)
-VALUES (17, 'Show Alpha Search',
+VALUES ('17', 'Show Alpha Search',
         'Show links to filter search results by the first letter.',
-        '0', '0', 0, 'select');
+        '0', '0', '0', 'select');
 
 INSERT INTO member (id, grp__id, class__id, active)
-VALUES (903, 22, 48, 1);
+VALUES ('903', '22', '48', '1');
 
 INSERT INTO pref_member (id, object_id, member__id)
-VALUES (17, 17, 903);
+VALUES ('17', '17', '903');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (17, '0', 'Off');
+VALUES ('17', '0', 'Off');
 
 INSERT INTO pref_opt (pref__id, value, description)
-VALUES (17, '1', 'On');
+VALUES ('17', '1', 'On');

Modified: bricolage/trunk/sql/Pg/Bric/Util/Priv.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Priv.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Priv.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -11,10 +11,10 @@
 --        Privileges granted to user groups.
 
 CREATE TABLE grp_priv (
-    id         NUMERIC(10, 0)    NOT NULL
+    id         INTEGER           NOT NULL
                                  DEFAULT NEXTVAL('seq_priv'),
-    grp__id    NUMERIC(10, 0)    NOT NULL,
-    value      NUMERIC(3, 0)     NOT NULL
+    grp__id    INTEGER           NOT NULL,
+    value      INT2              NOT NULL
                                  CONSTRAINT ck_grp_priv__value
                                    CHECK (value BETWEEN 1 AND 255),
     mtime      TIMESTAMP         NOT NULL
@@ -29,8 +29,8 @@
 --        is granted.
 
 CREATE TABLE grp_priv__grp_member (
-    grp_priv__id    NUMERIC(10, 0)    NOT NULL,
-    grp__id         NUMERIC(10, 0)    NOT NULL,
+    grp_priv__id    INTEGER           NOT NULL,
+    grp__id         INTEGER           NOT NULL,
     CONSTRAINT pk_grp_priv__grp_member PRIMARY KEY (grp_priv__id,grp__id)
 );
 
@@ -58,8 +58,8 @@
 --
 
 CREATE TABLE grp_priv__grp(
-    grp_priv__id    NUMERIC(10, 0)    NOT NULL,
-    grp__id         NUMERIC(10, 0)    NOT NULL,
+    grp_priv__id    INTEGER           NOT NULL,
+    grp__id         INTEGER           NOT NULL,
     CONSTRAINT pk_grp_priv__grp PRIMARY KEY (grp_priv__id,grp__id)
 ) 
 ;
@@ -70,8 +70,8 @@
 --
 
 CREATE TABLE grp_priv__person(
-    grp_priv__id    NUMERIC(10, 0)    NOT NULL,
-    person__id      NUMERIC(10, 0)    NOT NULL,
+    grp_priv__id    INTEGER           NOT NULL,
+    person__id      INTEGER           NOT NULL,
     CONSTRAINT pk_grp_priv__person PRIMARY KEY (grp_priv__id,person__id)
 ) 
 ;
@@ -82,8 +82,8 @@
 --
 
 CREATE TABLE grp_priv__usr(
-    grp_priv__id    NUMERIC(10, 0)    NOT NULL,
-    usr__id        NUMERIC(10, 0)    NOT NULL,
+    grp_priv__id    INTEGER           NOT NULL,
+    usr__id        INTEGER           NOT NULL,
     CONSTRAINT pk_grp_priv__usr PRIMARY KEY (grp_priv__id,usr__id)
 ) 
 ;
@@ -94,7 +94,7 @@
 --
 
 CREATE TABLE priv_table(
-    id      NUMERIC(10, 0)    NOT NULL,
+    id      INTEGER           NOT NULL,
     name    VARCHAR(30)    NOT NULL,
     CONSTRAINT pk_priv_table__id PRIMARY KEY (id)
 ) 
@@ -106,9 +106,9 @@
 --
 
 CREATE TABLE usr_priv(
-    id          NUMERIC(10, 0)    NOT NULL,
-    usr__id    NUMERIC(10, 0)    NOT NULL,
-    value       NUMERIC(2, 0)     NOT NULL,
+    id          INTEGER           NOT NULL,
+    usr__id    INTEGER           NOT NULL,
+    value       INT2     NOT NULL,
     CONSTRAINT pk_usr_priv__id PRIMARY KEY (id)
 ) 
 ;
@@ -119,8 +119,8 @@
 --
 
 CREATE TABLE usr_priv__grp(
-    priv_usr__id    NUMERIC(10, 0)    NOT NULL,
-    grp__id          NUMERIC(10, 0)    NOT NULL,
+    priv_usr__id    INTEGER           NOT NULL,
+    grp__id          INTEGER           NOT NULL,
     CONSTRAINT pk_usr_priv__grp PRIMARY KEY (priv_usr__id,grp__id)
 ) 
 ;
@@ -131,8 +131,8 @@
 --
 
 CREATE TABLE usr_priv__person(
-    usr_priv__id    NUMERIC(10, 0)    NOT NULL,
-    person__id       NUMERIC(10, 0)    NOT NULL,
+    usr_priv__id    INTEGER           NOT NULL,
+    person__id       INTEGER           NOT NULL,
     CONSTRAINT pk_usr_priv__person PRIMARY KEY (usr_priv__id,person__id)
 ) 
 ;
@@ -143,8 +143,8 @@
 --
 
 CREATE TABLE usr_priv__usr(
-    usr_priv__id    NUMERIC(10, 0)    NOT NULL,
-    usr__id         NUMERIC(10, 0)    NOT NULL,
+    usr_priv__id    INTEGER           NOT NULL,
+    usr__id         INTEGER           NOT NULL,
     CONSTRAINT pk_usr_priv__usr PRIMARY KEY (usr_priv__id,usr__id)
 ) 
 ;
@@ -155,8 +155,8 @@
 --
 
 CREATE TABLE usr_priv__grp_member(
-    usr_priv__id    NUMERIC(10, 0)    NOT NULL,
-    grp__id          NUMERIC(10, 0)    NOT NULL,
+    usr_priv__id    INTEGER           NOT NULL,
+    grp__id          INTEGER           NOT NULL,
     CONSTRAINT pk_usr_priv__grp_member PRIMARY KEY (usr_priv__id,grp__id)
 ) 
 ;

Modified: bricolage/trunk/sql/Pg/Bric/Util/Priv.val
===================================================================
--- bricolage/trunk/sql/Pg/Bric/Util/Priv.val	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric/Util/Priv.val	2004-11-09 03:32:57 UTC (rev 6066)
@@ -9,417 +9,417 @@
 
 -- Give Contributor Administrators CREATE rights to All Contributors.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(1, 15, 3);
+VALUES('1', '15', '3');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(1, 1);
+VALUES('1', '1');
 
 -- Give User Administrators CREATE rights to All Users.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(2, 11, 3);
+VALUES('2', '11', '3');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(2, 2);
+VALUES('2', '2');
 
 -- Give Source Administrators CREATE rights to All Organizations.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(3, 18, 3);
+VALUES('3', '18', '3');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(3, 3);
+VALUES('3', '3');
 
 -- Give Source Administrators CREATE rights to All Sources.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(4, 18, 3);
+VALUES('4', '18', '3');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(4, 5);
+VALUES('4', '5');
 
 -- Give Alert Type Administrators CREATE rights to All Alert Types.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(5, 36, 3);
+VALUES('5', '36', '3');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(5, 4);
+VALUES('5', '4');
 
 */
 
 -- Give Story Editors PUBLISH rights to All Stories.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(6, 7, 5);
+VALUES('6', '7', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(6, 31);
+VALUES('6', '31');
 
 -- Give Story Editors READ rights to all categories.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(43, 7, 1);
+VALUES('43', '7', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(43, 26);
+VALUES('43', '26');
 
 -- Give Story Editors READ rights to all elements.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(44, 7, 1);
+VALUES('44', '7', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(44, 27);
+VALUES('44', '27');
 
 -- Give Story Editors READ rights to all sites.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(54, 7, 1);
+VALUES('54', '7', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(54, 47);
+VALUES('54', '47');
 
 -- Give Story Editors EDIT rights to the Story workflow.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(31, 7, 2);
+VALUES('31', '7', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(31, 49);
+VALUES('31', '49');
 
 -- Give Story Editors CREATE rights to the Edit desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(32, 7, 4);
+VALUES('32', '7', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(32, 61);
+VALUES('32', '61');
 
 -- Give Story Editors EDIT rights to the Copy desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(33, 7, 2);
+VALUES('33', '7', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(33, 62);
+VALUES('33', '62');
 
 -- Give Story Editors EDIT rights to the Legal desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(34, 7, 2);
+VALUES('34', '7', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(34, 63);
+VALUES('34', '63');
 
 -- Give Story Editors PUBLISH rights to the Publish desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(35, 7, 5);
+VALUES('35', '7', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(35, 64);
+VALUES('35', '64');
 
 -- Give Media Producers PUBLISH rights to All Media.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(7, 8, 5);
+VALUES('7', '8', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(7, 32);
+VALUES('7', '32');
 
 -- Give Media Producers READ rights to all categories.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(45, 8, 1);
+VALUES('45', '8', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(45, 26);
+VALUES('45', '26');
 
 -- Give Media Producers READ rights to all elements.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(46, 8, 1);
+VALUES('46', '8', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(46, 27);
+VALUES('46', '27');
 
 -- Give Media Producers READ rights to all sites.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(55, 8, 1);
+VALUES('55', '8', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(55, 47);
+VALUES('55', '47');
 
 -- Give Media Producers EDIT rights to the Media workflow.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(36, 8, 2);
+VALUES('36', '8', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(36, 51);
+VALUES('36', '51');
 
 -- Give Media Producers CREATE rights to the Art desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(37, 8, 4);
+VALUES('37', '8', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(37, 65);
+VALUES('37', '65');
 
 -- Give Media Producers EDIT rights to the Legal desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(38, 8, 2);
+VALUES('38', '8', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(38, 63);
+VALUES('38', '63');
 
 -- Give Media Producers PUBLISH rights to the Publish desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(39, 8, 5);
+VALUES('39', '8', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(39, 64);
+VALUES('39', '64');
 
 -- Give Template Developers PUBLISH rights to All Templates.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(8, 9, 5);
+VALUES('8', '9', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(8, 33);
+VALUES('8', '33');
 
 -- Give Template Developers READ rights to all categories.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(47, 9, 1);
+VALUES('47', '9', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(47, 26);
+VALUES('47', '26');
 
 -- Give Template Developers READ rights to all elements.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(48, 9, 1);
+VALUES('48', '9', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(48, 27);
+VALUES('48', '27');
 
 -- Give Template Developers READ rights to all sites.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(56, 9, 1);
+VALUES('56', '9', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(56, 47);
+VALUES('56', '47');
 
 -- Give Template Developers EDIT rights to the Template workflow.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(40, 9, 2);
+VALUES('40', '9', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(40, 52);
+VALUES('40', '52');
 
 -- Give Template Developers CREATE rights to the Development desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(41, 9, 4);
+VALUES('41', '9', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(41, 66);
+VALUES('41', '66');
 
 -- Give Template Developers PUBLISH rights to the Deploy desk.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(42, 9, 5);
+VALUES('42', '9', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(42, 67);
+VALUES('42', '67');
 
 /*
 
 -- Give Element Administrators CREATE rights to All Elements.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(9, 10, 4);
+VALUES('9', '10', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(9, 27);
+VALUES('9', '27');
 
 -- Give Preference Administrators CREATE rights to All Preference.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(10, 12, 4);
+VALUES('10', '12', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(10, 22);
+VALUES('10', '22');
 
 -- Give Group Administrators CREATE rights to All Groups.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(11, 13, 4);
+VALUES('11', '13', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(11, 35);
+VALUES('11', '35');
 
 -- Give Output Channel Administrators CREATE rights to All .
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(12, 14, 4);
+VALUES('12', '14', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(12, 23);
+VALUES('12', '23');
 
 -- Give Workflow Administrators CREATE rights to All Workflows.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(13, 16, 4);
+VALUES('13', '16', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(13, 25);
+VALUES('13', '25');
 
 -- Give Category Administrators CREATE rights to All Categories.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(14, 17, 4);
+VALUES('14', '17', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(14, 26);
+VALUES('14', '26');
 
 */
 
 -- Give Distribution Administrators CREATE rights to All Destinations.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(15, 19, 4);
+VALUES('15', '19', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(15, 29);
+VALUES('15', '29');
 
 -- Give Distribution Administrators CREATE rights to All Jobs.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(16, 19, 4);
+VALUES('16', '19', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(16, 30);
+VALUES('16', '30');
 
 -- Give Publishing Administrators CREATE rights to All Output Channels.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(17, 20, 4);
+VALUES('17', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(17, 23);
+VALUES('17', '23');
 
 -- Give Publishing Administrators CREATE rights to All Contributors.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(18, 20, 4);
+VALUES('18', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(18, 1);
+VALUES('18', '1');
 
 -- Give Publishing Administrators CREATE rights to All Contributor Types.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(19, 20, 4);
+VALUES('19', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(19, 24);
+VALUES('19', '24');
 
 -- Give Publishing Administrators CREATE rights to All Workflows.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(20, 20, 4);
+VALUES('20', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(20, 25);
+VALUES('20', '25');
 
 -- Give Publishing Administrators CREATE rights to All Categories.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(21, 20, 4);
+VALUES('21', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(21, 26);
+VALUES('21', '26');
 
 -- Give Publishing Administrators CREATE rights to All Elements.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(22, 20, 4);
+VALUES('22', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(22, 27);
+VALUES('22', '27');
 
 -- Give Publishing Administrators CREATE rights to All Element Types.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(23, 20, 4);
+VALUES('23', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(23, 28);
+VALUES('23', '28');
 
 -- Give Publishing Administrators CREATE rights to All Organizations.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(24, 20, 4);
+VALUES('24', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(24, 4);
+VALUES('24', '4');
 
 -- Give Publishing Administrators CREATE rights to All Sources.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(25, 20, 4);
+VALUES('25', '20', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(25, 5);
+VALUES('25', '5');
 
 -- Give System Administrators CREATE rights to All Preferences.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(26, 21, 4);
+VALUES('26', '21', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(26, 22);
+VALUES('26', '22');
 
 -- Give System Administrators CREATE rights to All Users.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(27, 21, 4);
+VALUES('27', '21', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(27, 2);
+VALUES('27', '2');
 
 -- Give System Administrators CREATE rights to All Groups.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(28, 21, 4);
+VALUES('28', '21', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(28, 35);
+VALUES('28', '35');
 
 -- Give System Administrators CREATE rights to All Sites.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(49, 21, 4);
+VALUES('49', '21', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(49, 47);
+VALUES('49', '47');
 
 /*
 
 -- Give Contributor Type Administrators CREATE rights to All Contributor Types.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(29, 37, 4);
+VALUES('29', '37', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(29, 24);
+VALUES('29', '24');
 
 -- Give Element Type Administrators CREATE rights to All Element Types.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(30, 38, 4);
+VALUES('30', '38', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(30, 28);
+VALUES('30', '28');
 
 */
 
 -- Give "Default Site READ Users" READ rights to the default Site's asset group.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(50, 200, 1);
+VALUES('50', '200', '1');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(50, 100);
+VALUES('50', '100');
 
 -- Give "Default Site EDIT Users" EDIT rights to the default Site's asset group.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(51, 201, 2);
+VALUES('51', '201', '2');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(51, 100);
+VALUES('51', '100');
 
 -- Give "Default Site CREATE Users" CREATE rights to the default Site's asset
 -- group.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(52, 202, 4);
+VALUES('52', '202', '4');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(52, 100);
+VALUES('52', '100');
 
 -- Give "Default Site DENY Users" DENY rights to the default Site's asset group.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(53, 203, 255);
+VALUES('53', '203', '255');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(53, 100);
+VALUES('53', '100');
 
 -- Give "Default Site RECALL Users" RECALL rights to the default Site's asset group.
 INSERT INTO grp_priv (id, grp__id, value)
-VALUES(57, 204, 3);
+VALUES('57', '204', '3');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(57, 100);
+VALUES('57', '100');
 
 -- Give "Default Site PUBLISH Users" PUBLISH rights to the default Site's asset \
group.  INSERT INTO grp_priv (id, grp__id, value)
-VALUES(58, 205, 5);
+VALUES('58', '205', '5');
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(58, 100);
+VALUES('58', '100');

Modified: bricolage/trunk/sql/Pg/Bric.sql
===================================================================
--- bricolage/trunk/sql/Pg/Bric.sql	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/sql/Pg/Bric.sql	2004-11-09 03:32:57 UTC (rev 6066)
@@ -12,10 +12,10 @@
 -- Functions. 
 --
 
--- This funtion allows us to create UNIQUE indices that combine a lowercased
--- TEXT (or VARCHAR) column with a NUMERIC column. See Bric/Util/AlertType.sql
+-- This function allows us to create UNIQUE indices that combine a lowercased
+-- TEXT (or VARCHAR) column with a INTEGER column. See Bric/Util/AlertType.sql
 -- for an example.
-CREATE   FUNCTION lower_text_num(TEXT, NUMERIC(10, 0))
+CREATE   FUNCTION lower_text_num(TEXT, INTEGER)
 RETURNS  TEXT AS 'SELECT LOWER($1) || to_char($2, ''|FM9999999999'')'
 LANGUAGE 'sql'
 WITH     (ISCACHABLE);
@@ -24,7 +24,7 @@
 -- string. It is used primarily for the id_list aggregate (below). We omit
 -- the ID 0 because it is a hidden, secret group to which permissions do not
 -- apply.
-CREATE   FUNCTION append_id(TEXT, NUMERIC(10,0))
+CREATE   FUNCTION append_id(TEXT, INTEGER)
 RETURNS  TEXT AS '
     SELECT CASE WHEN $2 = 0 THEN
                 $1
@@ -42,7 +42,17 @@
 -- LIMIT.
 CREATE AGGREGATE id_list (
     SFUNC    = append_id,
-    BASETYPE = NUMERIC(10, 0),
+    BASETYPE = INTEGER,
     STYPE    = TEXT,
     INITCOND = ''
-);
\ No newline at end of file
+);
+
+/*
+-- This is a temporary compatibility measure.
+CREATE FUNCTION int_to_boolean(integer) RETURNS boolean
+  AS 'select case when $1 = 0 then false else true end'
+LANGUAGE 'sql' IMMUTABLE;
+
+CREATE CAST (integer AS boolean)
+  WITH FUNCTION int_to_boolean(integer) AS IMPLICIT;
+*/
\ No newline at end of file

Modified: bricolage/trunk/t/Bric/Util/DBI/DevTest.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/DBI/DevTest.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/t/Bric/Util/DBI/DevTest.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -19,18 +19,18 @@
     # to produce the same result
     Bric::Util::DBI::execute( Bric::Util::DBI::prepare(q{
          CREATE TABLE test_fetch_objects (
-                one        NUMERIC(10,0) NULL,
-                two        NUMERIC(10,0) NULL,
-                three      NUMERIC(10,0) NULL,
-                four       NUMERIC(10,0) NULL,
-                five       NUMERIC(10,0) NULL,
-                six        NUMERIC(10,0) NULL,
-                seven      NUMERIC(10,0) NULL,
-                eight      NUMERIC(10,0) NULL,
-                nine       NUMERIC(10,0) NULL,
-                ten        NUMERIC(10,0) NULL,
-                eleven     NUMERIC(10,0) NULL,
-                twelve     NUMERIC(10,0) NULL
+                one        INTEGER NULL,
+                two        INTEGER NULL,
+                three      INTEGER NULL,
+                four       INTEGER NULL,
+                five       INTEGER NULL,
+                six        INTEGER NULL,
+                seven      INTEGER NULL,
+                eight      INTEGER NULL,
+                nine       INTEGER NULL,
+                ten        INTEGER NULL,
+                eleven     INTEGER NULL,
+                twelve     INTEGER NULL
             ) }));
 
     my $sth = prepare(q{

Modified: bricolage/trunk/t/Bric/Util/Grp/DevTest.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/Grp/DevTest.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/t/Bric/Util/Grp/DevTest.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -198,7 +198,7 @@
 
     # Now test the get_members method.
     ok( my @mems = $grp->get_members, "Get pref members" );
-    is( scalar @mems, 12, "Check number of pref mems" );
+    is( scalar @mems, 13, "Check number of pref mems" );
     ok( my ($mem) = (grep { $_->get_id == 401 } @mems), "Get tz member" );
     ok( UNIVERSAL::isa($mem, 'Bric::Util::Grp::Parts::Member'),
         "Check tz member class" );
@@ -209,14 +209,14 @@
     # Try deleting a member.
     ok( $grp->delete_member($mem), "Delete Member" );
     ok( @mems = $grp->get_members, "Get pref members again" );
-    is( scalar @mems, 11, "Check number of pref mems 2" );
+    is( scalar @mems, 12, "Check number of pref mems 2" );
     ok( ! (grep { $_->get_id == 401 } @mems), "Don't get tz member" );
 
     # Now add the member back.
     ok( $grp->add_member({ package => 'Bric::Util::Pref', id => 1 }),
         "Add the preference again" );
     ok( @mems = $grp->get_members, "Get pref members 3" );
-    is( scalar @mems, 12, "Check number of pref mems 3" );
+    is( scalar @mems, 13, "Check number of pref mems 3" );
 
     # Play around with has_member().
     ok( $grp->has_member({ package => 'Bric::Util::Pref', id => 2 }),
@@ -269,7 +269,7 @@
 
     # Now get the objects.
     ok( my @prefs = $grp->get_objects, "Get pref objects" );
-    is( scalar @prefs, 12, "Check number of pref mems" );
+    is( scalar @prefs, 13, "Check number of pref mems" );
     isa_ok( $prefs[0], 'Bric::Util::Pref' );
 
     # Try an element group, just for the heck of it.

Modified: bricolage/trunk/t/Bric/Util/Pref/DevTest.pm
===================================================================
--- bricolage/trunk/t/Bric/Util/Pref/DevTest.pm	2004-11-09 02:58:13 UTC (rev 6065)
+++ bricolage/trunk/t/Bric/Util/Pref/DevTest.pm	2004-11-09 03:32:57 UTC (rev 6066)
@@ -33,7 +33,7 @@
 
 ##############################################################################
 # Test list().
-sub test_list : Test(40) {
+sub test_list : Test(41) {
     my $self = shift;
 
     # Create a new job group.
@@ -66,7 +66,7 @@
     # Try grp_id.
     ok( @prefs = Bric::Util::Pref->list({ grp_id => $grp_id }),
         "Look up grp_id '$grp_id'" );
-    is( scalar @prefs, 6, "Check for 6 prefs" );
+    is( scalar @prefs, 7, "Check for 7 prefs" );
 
     # Make sure we've got all the Group IDs we think we should have.
     my $all_grp_id = Bric::Util::Pref::INSTANCE_GROUP_ID;
@@ -83,7 +83,7 @@
     # Now there should only be three using grp_id.
     ok( @prefs = Bric::Util::Pref->list({ grp_id => $grp_id }),
         "Look up grp_id '$grp_id' again" );
-    is( scalar @prefs, 5, "Check for 5 prefs" );
+    is( scalar @prefs, 6, "Check for 6 prefs" );
 
 
     # Try val_name.
@@ -120,7 +120,7 @@
     is( scalar @prefs, 1, "Check for 1 prefs" );
     ok( @prefs = Bric::Util::Pref->list({ manual => 0 }),
         "Look up manual => 0" );
-    is( scalar @prefs, 11, "Check for 11 prefs" );
+    is( scalar @prefs, 12, "Check for 12prefs" );
 
     # Try opt_type.
     ok( @prefs = Bric::Util::Pref->list({ opt_type => 'radio' }),
@@ -128,6 +128,6 @@
     is( scalar @prefs, 1, "Check for 1 prefs" );
     ok( @prefs = Bric::Util::Pref->list({ opt_type => 'select' }),
         "Look up opt_type 'select'" );
-    is( scalar @prefs, 10, "Check for 10 prefs" );
+    is( scalar @prefs, 11, "Check for 11 prefs" );
 
 }



[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic