SF.net SVN: ledger-smb:[3505] trunk/sql/upgrade/1.2-1.3-work-in-progress. sql

[..hidden..]

Revision: 3505
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3505&view=rev
Author:   einhverfr
Date:     2011-07-13 21:25:44 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
Migration routines now run cleanly for me

Modified Paths:
--------------
    trunk/sql/upgrade/1.2-1.3-work-in-progress.sql

Modified: trunk/sql/upgrade/1.2-1.3-work-in-progress.sql
===================================================================
--- trunk/sql/upgrade/1.2-1.3-work-in-progress.sql	2011-07-13 21:05:19 UTC (rev 3504)
+++ trunk/sql/upgrade/1.2-1.3-work-in-progress.sql	2011-07-13 21:25:44 UTC (rev 3505)
@@ -21,7 +21,9 @@
 \i sql/modules/Setting.sql
 \i sql/modules/Location.sql
 \i sql/modules/Account.sql
-
+\i sql/modules/Payment.sql
+\i sql/modules/Person.sql
+\i sql/modules/Reconciliation.sql
 BEGIN;
 
 -- adding mapping info for import.
@@ -632,14 +634,13 @@
  SELECT setval('entity_bank_account_id_seq', max(id)) FROM entity_bank_account;
  SELECT setval('note_class_id_seq', max(id)) FROM note_class;
  SELECT setval('note_id_seq', max(id)) FROM note;
- SELECT setval('trial_balance_id_seq', max(id)) FROM trial_balance;
  SELECT setval('batch_class_id_seq', max(id)) FROM batch_class;
  SELECT setval('batch_id_seq', max(id)) FROM batch;
  SELECT setval('invoice_id_seq', max(id)) FROM invoice;
  SELECT setval('voucher_id_seq', max(id)) FROM voucher;
  SELECT setval('parts_id_seq', max(id)) FROM parts;
- SELECT setval('taxmodule_taxmodule_id_seq', max(id)) FROM taxmodule_taxmodule;
- SELECT setval('taxcategory_taxcategory_id_seq', max(id)) FROM taxcategory_taxcategory;
+ SELECT setval('taxmodule_taxmodule_id_seq', max(taxmodule_id)) FROM taxmodule;
+ SELECT setval('taxcategory_taxcategory_id_seq', max(taxcategory_id)) FROM taxcategory;
  SELECT setval('oe_id_seq', max(id)) FROM oe;
  SELECT setval('orderitems_id_seq', max(id)) FROM orderitems;
  SELECT setval('business_id_seq', max(id)) FROM business;
@@ -649,8 +650,8 @@
  SELECT setval('department_id_seq', max(id)) FROM department;
  SELECT setval('jcitems_id_seq', max(id)) FROM jcitems;
  SELECT setval('payment_type_id_seq', max(id)) FROM payment_type;
- SELECT setval('custom_table_catalog_table_id_seq', max(id)) FROM custom_table_catalog_table;
- SELECT setval('custom_field_catalog_field_id_seq', max(id)) FROM custom_field_catalog_field;
+ SELECT setval('custom_table_catalog_table_id_seq', max(table_id)) FROM custom_table_catalog;
+ SELECT setval('custom_field_catalog_field_id_seq', max(field_id)) FROM custom_field_catalog;
  SELECT setval('menu_node_id_seq', max(id)) FROM menu_node;
  SELECT setval('menu_attribute_id_seq', max(id)) FROM menu_attribute;
  SELECT setval('menu_acl_id_seq', max(id)) FROM menu_acl;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.