SF.net SVN: ledger-smb:[3951] branches/1.3

[..hidden..]

Revision: 3951
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3951&view=rev
Author:   einhverfr
Date:     2011-11-01 23:35:02 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Correcting load errors on upgrade per David Bandel's suggestions

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/sql/upgrade/1.2-1.3.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-01 04:35:41 UTC (rev 3950)
+++ branches/1.3/Changelog	2011-11-01 23:35:02 UTC (rev 3951)
@@ -5,7 +5,7 @@
 Changelog for LedgerSMB 1.3.4
 * Corrected case matching error in upgrade script (Chris T)
 * Corrected version number on new databases (Chris T)
-* Corrected load errors on upgrade (David B)
+* Corrected multiple load errors on upgrade (David B)
 
 Chris T is Chris Travers
 David B is David Bandel

Modified: branches/1.3/sql/upgrade/1.2-1.3.sql
===================================================================
--- branches/1.3/sql/upgrade/1.2-1.3.sql	2011-11-01 04:35:41 UTC (rev 3950)
+++ branches/1.3/sql/upgrade/1.2-1.3.sql	2011-11-01 23:35:02 UTC (rev 3951)
@@ -5,26 +5,6 @@
 \set ar '''<?lsmb default_ar ?>'''
 \set ap '''<?lsmb default_ap ?>'''
 
--- This will be moved out of this part.
-ALTER SCHEMA public RENAME TO lsmb12;
-CREATE SCHEMA public;
-
-\cd :contribdir
-\i pg_trgm.sql
-\i tsearch2.sql
-\i tablefunc.sql
-
-\cd :lsmbdir
-
--- Full module load should be part of upgrade wizard, at this stage.
-\i sql/Pg-database.sql
-\i sql/modules/Settings.sql
-\i sql/modules/Location.sql
-\i sql/modules/Account.sql
-\i sql/modules/Payment.sql
-\i sql/modules/Company.sql
-\i sql/modules/Person.sql
-\i sql/modules/Reconciliation.sql
 BEGIN;
 
 -- adding mapping info for import.
@@ -382,7 +362,8 @@
 select name, name, entity_id FROM lsmb12.employee;
 
 INSERT INTO users (entity_id, username)
-     SELECT entity_id, login FROM lsmb12.employee em;
+     SELECT entity_id, login FROM lsmb12.employee em
+      WHERE login IS NOT NULL;
 
 INSERT 
   INTO entity_employee(entity_id, startdate, enddate, role, ssn, sales,

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