upgrade.sh: run slave_only SQL after slave SQL

The slave_only SQL may have triggers that depend on functions created in
the slave SQL.

Author: mwiencek

upgrade.sh

@@ -57,6 +57,16 @@ then
     OUTPUT=`./admin/psql --system "$DATABASE" < ./admin/sql/DisableLastUpdatedTriggers.sql 2>&1` || ( echo "$OUTPUT" ; exit 1 )
 fi
 
+################################################################################
+# Scripts that should run on *all* nodes (master/slave/standalone)
+
+echo `date` : 'Running upgrade scripts for all nodes'
+if [ -e "$EXTENSIONS_SQL" ]
+then
+    ./admin/psql --system "$DATABASE" < "$EXTENSIONS_SQL" || exit 1
+fi
+./admin/psql "$DATABASE" < $SQL_DIR/${NEW_SCHEMA_SEQUENCE}.slave.sql || exit 1
+
 ################################################################################
 # Migrations that apply for only slaves
 if [ "$REPLICATION_TYPE" = "$RT_SLAVE" ]
@@ -68,16 +78,6 @@ then
     fi
 fi
 
-################################################################################
-# Scripts that should run on *all* nodes (master/slave/standalone)
-
-echo `date` : 'Running upgrade scripts for all nodes'
-if [ -e "$EXTENSIONS_SQL" ]
-then
-    ./admin/psql --system "$DATABASE" < "$EXTENSIONS_SQL" || exit 1
-fi
-./admin/psql "$DATABASE" < $SQL_DIR/${NEW_SCHEMA_SEQUENCE}.slave.sql || exit 1
-
 ################################################################################
 # Re-enable replication