[ljcom] r11322: LJSUP-10748: Free2pay

U   trunk/bin/upgrading/update-db-local.pl

Modified: trunk/bin/upgrading/update-db-local.pl
===================================================================
--- trunk/bin/upgrading/update-db-local.pl	2012-01-18 09:06:18 UTC (rev 11321)
+++ trunk/bin/upgrading/update-db-local.pl	2012-01-18 10:03:04 UTC (rev 11322)
@@ -15,8 +15,8 @@
 )
 EOC
 
-register_tablecreate("ftp_transactions", <<EOC);
-CREATE TABLE `ftp_transactions` (
+register_tablecreate("free2pay_trx", <<EOC);
+CREATE TABLE `free2pay_trx` (
     `id`     int(11) NOT NULL auto_increment,
     `name`   varchar(50) NOT NULL,
     `date`   datetime default NULL,
@@ -2280,6 +2280,10 @@
                  "ALTER TABLE shop_vgifts ADD position int(10) unsigned NOT NULL DEFAULT 0 AFTER available_bit");
     }
 
+    if ( table_exists('ftp_transactions') && table_exists('free2pay_trx') ) {
+        do_sql("DROP TABLE ftp_transactions");
+    }
+
     if ( table_exists('ftp_transactions') ) {
         do_alter( 'ftp_transactions',
                   "ALTER TABLE ftp_transactions RENAME free2pay_trx");