From bdb897ddd92718bcc3d4472a8b0c910ed1cba33c Mon Sep 17 00:00:00 2001
From: Ben Thompson <ben@xtuple.com>
Date: Mon, 1 Apr 2013 18:17:44 -0400
Subject: [PATCH] correct the order of tables in init_global.sql

---
 node-datasource/database/source/init_global.sql | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/node-datasource/database/source/init_global.sql b/node-datasource/database/source/init_global.sql
index 8b769f18e3e..17bac7e3d13 100644
--- a/node-datasource/database/source/init_global.sql
+++ b/node-datasource/database/source/init_global.sql
@@ -10,13 +10,10 @@
 -- [ START ] xt
 
 -- xt tables
-\i xt/tables/bicache.sql
+-- These need to be in the correct order for them to load based on dependant columns.
 \i xt/tables/datasource.sql
 \i xt/tables/dbserver.sql
 \i xt/tables/ext.sql
-\i xt/tables/oa2client.sql
-\i xt/tables/oa2clientredirs.sql
-\i xt/tables/oa2token.sql
 \i xt/tables/org.sql
 \i xt/tables/orgext.sql
 -- TODO Remove session in a future version after it has had time to be dropped.
@@ -24,9 +21,16 @@
 \i xt/tables/sessionorg.sql
 
 \i xt/tables/sessionstore.sql
+
 \i xt/tables/usr.sql
 \i xt/tables/usrorg.sql
 
+\i xt/tables/oa2client.sql
+\i xt/tables/oa2clientredirs.sql
+\i xt/tables/oa2token.sql
+
+\i xt/tables/bicache.sql
+
 -- xt functions
 \i xt/functions/add_priv.sql