脚本执行顺序调整

TRS.WCM.Developer/贵州项目/0_update_data_dbfield.sql

@@ -7,11 +7,12 @@ DELIMITER $$
 CREATE PROCEDURE update_data_dbfield (
 	IN metableName VARCHAR(255),
 	IN tableId BIGINT ( 20 ),
-	IN dbfieldinfoOffset BIGINT ( 20 )
+	IN dbfieldinfoOffset BIGINT ( 20 ),
+	out v_sql longtext
 	)
 	BEGIN
 		#xwcmdbfieldinfo 添加默认字段
-		select CONCAT('INSERT INTO  xwcmdbfieldinfo
+		set v_sql =  CONCAT('INSERT INTO  xwcmdbfieldinfo
 			(DBFIELDINFOID, TABLENAME, TABLEID, FIELDNAME, ANOTHERNAME, FIELDTYPE, DBTYPE, DBLENGTH, DEFAULTVALUE, ENMVALUE, NOTNULL, CLASSID, DBSCALE, CRUSER, CRTIME, VALIDATOR, RADORCHK, NOTEDIT, HIDDENFIELD)
 	VALUES (',dbfieldinfoOffset,' + 1, ',metableName,' ,',tableId,', \'FromType\', \'第三方类型\', 45, 4, 0, NULL, NULL, 0, 0, 0, \'admin\', \'2018-09-20 14:50:31\', NULL, NULL, 0, 0);
 
@@ -58,7 +59,6 @@ CREATE PROCEDURE update_data_dbfield (
                        add column ThumbFiles varchar(2000) DEFAULT NULL,
                        add column VersionNum int(11) DEFAULT NULL,
                        add column DocType int(11) DEFAULT NULL;
- ') info;
-
+ ');
 END $$
 DELIMITER;

TRS.WCM.Developer/贵州项目/0_update_data_table.sql

@@ -16,6 +16,7 @@ CREATE PROCEDURE update_data_table(IN prevtabelId BIGINT(20))
     DECLARE  f_CRTIME datetime DEFAULT NULL;
     DECLARE  f_OWNERTYPE int(11) DEFAULT '1';
     DECLARE  f_OWNERID int(11) DEFAULT '4';
+    DECLARE  v_sql longtext DEFAULT '';
 
 
 
@@ -60,10 +61,11 @@ CREATE PROCEDURE update_data_table(IN prevtabelId BIGINT(20))
               SET f_TABLEINFOID = f_TABLEINFOID + @table_offset_num;
 
               set @max_dbfieldinfo_id = ifnull((SELECT MAX(DBFIELDINFOID) from xwcmdbfieldinfo), 0);
-
-              call update_data_dbfield(f_TABLENAME, f_TABLEINFOID, @max_dbfieldinfo_id + (@i * 9));
+              set @sql = '';
+              call update_data_dbfield(f_TABLENAME, f_TABLEINFOID, @max_dbfieldinfo_id + (@i * 9), @sql);
 
               set @i = @i + 1;
+              set v_sql = concat(v_sql, @sql);
               SET @log_sql = build_migration_log_sql('update_data_tabel_id', f_TABLEINFOID, now());
               prepare stmt from @log_sql;
               EXECUTE stmt;
@@ -82,7 +84,7 @@ CREATE PROCEDURE update_data_table(IN prevtabelId BIGINT(20))
       ;
 		
 	END WHILE;
-
+  select v_sql info;
 	CLOSE cur;
 
   END $$