1.1.4 release, fix postgresql

3 files changed, 18 insertions, 9 deletions

diff --git a/README b/README
index 14234df5a..286cf03bb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, (pre) 1.1.4
+Freeside, 1.1.4
 
 Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 45332d85c..22891ec0f 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -68,7 +68,7 @@ my($char_d) = 80; #default maxlength for text fields
 
 #my(@date_type)  = ( 'timestamp', '', ''     );
 my(@date_type)  = ( 'int', 'NULL', ''     );
-my(@perl_type) = ( 'long varchar', 'NULL', ''   ); 
+my(@perl_type) = ( 'varchar', 'NULL', ''   ); 
 my(@money_type);
 if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2)
   @money_type = ( 'money',   '', '' );
@@ -315,7 +315,7 @@ sub tables_hash_hack {
       'columns' => [
         'taxnum',   'int',   '',    '',
         'state',    'char',  '',    2,  #two letters max in US... elsewhere?
-        'county',   'varchar',  '',    $char_d,
+        'county',   'varchar',  'NULL',    $char_d,
         'tax',      'real',  '',    '', #tax %
       ],
       'primary_key' => 'taxnum',
@@ -353,7 +353,7 @@ sub tables_hash_hack {
         'state',    'char', '',     2,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
-        'trancode', 'TINYINT', '', '',
+        'trancode', 'int', '', '',
         'cardnum',  'varchar', '',     16,
         'exp',      @date_type,
         'payname',  'varchar', 'NULL', $char_d,
@@ -476,8 +476,8 @@ sub tables_hash_hack {
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
         '_password', 'varchar',   '',   25, #13 for encryped pw's plus ' *SUSPENDED*
         'popnum',    'int',    'NULL',   '',
-        'uid',       'bigint', 'NULL',   '',
-        'gid',       'bigint', 'NULL',   '',
+        'uid',       'int', 'NULL',   '',
+        'gid',       'int', 'NULL',   '',
         'finger',    'varchar',   'NULL',   $char_d,
         'dir',       'varchar',   'NULL',   $char_d,
         'shell',     'varchar',   'NULL',   $char_d,
@@ -493,7 +493,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'domsvc',    'int',    '',   '',
-        'domuid',    'bigint', '',   '',
+        'domuid',    'int', '',   '',
         'domuser',   'varchar',   '',   $char_d,
       ],
       'primary_key' => 'svcnum',
diff --git a/site_perl/dbdef_table.pm b/site_perl/dbdef_table.pm
index bc1454d9e..8c5bcfe77 100644
--- a/site_perl/dbdef_table.pm
+++ b/site_perl/dbdef_table.pm
@@ -202,12 +202,12 @@ sub sql_create_table {
 
   "CREATE TABLE ". $self->name. " ( ". join(", ", @columns). " )",
   ( map {
-    my($index) = $_ . "_index";
+    my($index) = $self->name. "__". $_ . "_index";
     $index =~ s/,\s*/_/g;
     "CREATE UNIQUE INDEX $index ON ". $self->name. " ($_)"
   } $self->unique->sql_list ),
   ( map {
-    my($index) = $_ . "_index";
+    my($index) = $self->name. "__". $_ . "_index";
     $index =~ s/,\s*/_/g;
     "CREATE INDEX $index ON ". $self->name. " ($_)"
   } $self->index->sql_list ),
@@ -225,6 +225,10 @@ sub sql_create_table {
 L<FS::dbdef>, L<FS::dbdef_unique>, L<FS::dbdef_index>, L<FS::dbdef_unique>,
 L<DBI>
 
+=head1 VERSION
+
+$Id: dbdef_table.pm,v 1.2 1998-10-14 07:05:06 ivan Exp $
+
 =head1 HISTORY
 
 class for dealing with table definitions
@@ -243,6 +247,11 @@ ivan@sisd.com 98-jun-4
 
 pod ivan@sisd.com 98-sep-24
 
+$Log: dbdef_table.pm,v $
+Revision 1.2  1998-10-14 07:05:06  ivan
+1.1.4 release, fix postgresql
+
+
 =cut
 
 1;