[freeside-commits] freeside/FS/FS Schema.pm,1.44.2.13,1.44.2.14

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv5861

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Schema.pm 
Log Message:
mysql, yes, mysql.

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.44.2.13
retrieving revision 1.44.2.14
diff -u -d -r1.44.2.13 -r1.44.2.14
--- Schema.pm	12 Oct 2007 17:50:08 -0000	1.44.2.13
+++ Schema.pm	25 Oct 2007 19:02:47 -0000	1.44.2.14
@@ -229,7 +229,7 @@
                                qw( name type null length default local )
                            } );
     
-                           if ( $column->type eq 'serial' ) {
+                           if ( $column->type =~ /^(\w*)SERIAL$/i ) {
                              $column->type('int');
                              $column->null('NULL');
                            }
@@ -924,7 +924,7 @@
         'catchall',         'int', 'NULL',       '', '', '',
 	'parent_svcnum',    'int', 'NULL',       '', '', '',
 	'registrarnum',     'int', 'NULL',       '', '', '',
-	'registrarkey', 'varchar', 'NULL',       '', '', '',
+	'registrarkey', 'varchar', 'NULL',      512, '', '',
 	'setup_date',  @date_type, '', '',
 	'renewal_interval', 'int', 'NULL',       '', '', '',
 	'expiration_date', @date_type, '', '',
@@ -1476,7 +1476,8 @@
         ###
 
         'acctid',   'bigserial',  '', '', '', '', 
-        'calldate', 'TIMESTAMP with time zone', '', '', \'now()', '',
+        #'calldate', 'TIMESTAMP with time zone', '', '', \'now()', '',
+        'calldate', 'timestamp',   '',      '', \'now()', '',
         'clid',        'varchar',  '', $char_d, \"''", '', 
         'src',         'varchar',  '', $char_d, \"''", '', 
         'dst',         'varchar',  '', $char_d, \"''", '', 
@@ -1568,7 +1569,7 @@
     'cdr_type' => {
       'columns' => [
         'cdrtypenum'  => 'serial',  '', '', '', '',
-        'cdrtypename' => 'varchar', '', '', '', '',
+        'cdrtypename' => 'varchar', '', $char_d, '', '',
       ],
       'primary_key' => 'cdrtypenum',
       'unique'      => [],
@@ -1578,7 +1579,7 @@
     'cdr_carrier' => {
       'columns' => [
         'carrierid'   => 'serial',  '', '', '', '',
-        'carriername' => 'varchar', '', '', '', '',
+        'carriername' => 'varchar', '', $char_d, '', '',
       ],
       'primary_key' => 'carrierid',
       'unique'      => [],
@@ -1682,7 +1683,7 @@
         'rightnum',   'serial', '',      '', '', '',
         'righttype', 'varchar', '', $char_d, '', '',
         'rightobjnum',   'int', '',      '', '', '',
-        'rightname', 'varchar', '',      '', '', '',
+        'rightname', 'varchar', '', $char_d, '', '',
       ],
       'primary_key' => 'rightnum',
       'unique' => [ [ 'righttype', 'rightobjnum', 'rightname' ] ],