Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
===================================================================
diff -u -r242af895b7cc36e5f825a4b99862b92a5faa87ed -r88c27e0aebd5d2edf351a8a9991d3b2ec5d72fb7
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql	(.../patch0017_updateFrom23-231.sql)	(revision 242af895b7cc36e5f825a4b99862b92a5faa87ed)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql	(.../patch0017_updateFrom23-231.sql)	(revision 88c27e0aebd5d2edf351a8a9991d3b2ec5d72fb7)
@@ -33,18 +33,6 @@
   PRIMARY KEY (user_id,page_str)
 )TYPE=InnoDB;
 
--- Add recently modified learning design list to Pedagogical Planner
-CREATE TABLE lams_planner_recent_learning_designs (
-     user_id  BIGINT(20) NOT NULL
-   , learning_design_id BIGINT(20) NOT NULL
-   , last_modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-   , CONSTRAINT FK_lams_planner_recent_learning_designs_1 FOREIGN KEY (user_id)
-                  REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
-   , CONSTRAINT FK_lams_planner_recent_learning_designs_2 FOREIGN KEY (learning_design_id)
-                  REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE
-   , PRIMARY KEY (user_id,learning_design_id)
-)TYPE=InnoDB;
-
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql	(revision 88c27e0aebd5d2edf351a8a9991d3b2ec5d72fb7)
@@ -0,0 +1,55 @@
+-- SQL statements to update from LAMS 2.3
+
+SET AUTOCOMMIT = 0;
+
+-- LDEV-2369
+ALTER TABLE lams_user ADD COLUMN tutorials_disabled TINYINT(1) DEFAULT 0;
+ALTER TABLE lams_user ADD COLUMN first_login TINYINT(1) DEFAULT 1;
+
+CREATE TABLE lams_user_disabled_tutorials (
+     user_id BIGINT(20) NOT NULL
+   , page_str CHAR(5) NOT NULL
+   , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+   , PRIMARY KEY (user_id,page_str)
+)TYPE=InnoDB;
+
+-- LDEV-2374
+ALTER TABLE lams_learning_activity ADD COLUMN transition_to_id BIGINT(20);
+ALTER TABLE lams_learning_activity ADD COLUMN transition_from_id BIGINT(20);
+
+ALTER TABLE lams_learning_transition MODIFY COLUMN learning_design_id BIGINT(20);
+ALTER TABLE lams_learning_transition DROP INDEX UQ_transition_activities;
+ALTER TABLE lams_learning_transition ADD COLUMN transition_type TINYINT NOT NULL DEFAULT 0;
+ALTER TABLE lams_learning_activity  
+	  ADD CONSTRAINT FK_lams_learning_activity_15 FOREIGN KEY (transition_to_id)
+                  REFERENCES lams_learning_transition (transition_id)
+     , ADD CONSTRAINT FK_lams_learning_activity_16 FOREIGN KEY (transition_from_id)
+                  REFERENCES lams_learning_transition (transition_id);
+
+CREATE TABLE lams_data_flow (
+	  data_flow_object_id BIGINT(20) NOT NULL auto_increment
+	, transition_id BIGINT(20) NOT NULL
+	, order_id INT(11) 
+	, name VARCHAR(255) NOT NULL
+	, display_name VARCHAR(255)
+	, tool_assigment_id INT(11)
+	, CONSTRAINT FK_lams_learning_transition_1 FOREIGN KEY (transition_id)
+                  REFERENCES lams_learning_transition (transition_id) ON DELETE CASCADE ON UPDATE CASCADE
+	, PRIMARY KEY (data_flow_object_id)
+)TYPE=InnoDB;
+
+-- LDEV-2380 Add recently modified learning design list to Pedagogical Planner
+CREATE TABLE lams_planner_recent_learning_designs (
+     user_id  BIGINT(20) NOT NULL
+   , learning_design_id BIGINT(20) NOT NULL
+   , last_modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+   , CONSTRAINT FK_lams_planner_recent_learning_designs_1 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+   , CONSTRAINT FK_lams_planner_recent_learning_designs_2 FOREIGN KEY (learning_design_id)
+                  REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE
+   , PRIMARY KEY (user_id,learning_design_id)
+)TYPE=InnoDB;
+
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file