去除指定的迁移数据库名称

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

@@ -1,24 +1,24 @@
 # 预处理数据的SQL
 
 # 相关视频 FieldType 由 51 变为 20
-update trs_data_migration.XWCMDBFieldInfo set FieldType=20 where FieldType=51;
-update trs_data_migration.XWCMViewFieldInfo set FieldType=20 where FieldType=51;
+update XWCMDBFieldInfo set FieldType=20 where FieldType=51;
+update XWCMViewFieldInfo set FieldType=20 where FieldType=51;
 # 相关图片 FieldType 由 50 变为 32
-update trs_data_migration.XWCMDBFieldInfo set FieldType=32 where FieldType=50;
-update trs_data_migration.XWCMViewFieldInfo set FieldType=32 where FieldType=50;
+update XWCMDBFieldInfo set FieldType=32 where FieldType=50;
+update XWCMViewFieldInfo set FieldType=32 where FieldType=50;
 # 相关文档 FieldType 由 57 变为 31
-update trs_data_migration.XWCMDBFieldInfo set FieldType=31 where FieldType=57;
-update trs_data_migration.XWCMViewFieldInfo set FieldType=31 where FieldType=57;
+update XWCMDBFieldInfo set FieldType=31 where FieldType=57;
+update XWCMViewFieldInfo set FieldType=31 where FieldType=57;
 
 # mw_文本框 FieldType 由 53 变为 3
-update trs_data_migration.XWCMDBFieldInfo set FieldType=3 where FieldType in (53,65);
-update trs_data_migration.XWCMViewFieldInfo set FieldType=3 where FieldType in (53,65);
+update XWCMDBFieldInfo set FieldType=3 where FieldType in (53,65);
+update XWCMViewFieldInfo set FieldType=3 where FieldType in (53,65);
 # mw_是否按钮 FieldType 由 54 变为 5
-update trs_data_migration.XWCMDBFieldInfo set FieldType=5 where FieldType=54;
-update trs_data_migration.XWCMViewFieldInfo set FieldType=5 where FieldType=54;
+update XWCMDBFieldInfo set FieldType=5 where FieldType=54;
+update XWCMViewFieldInfo set FieldType=5 where FieldType=54;
 # mw_时间按钮FieldType 由 55 变为 11
-update trs_data_migration.XWCMDBFieldInfo set FieldType=11 where FieldType=55;
-update trs_data_migration.XWCMViewFieldInfo set FieldType=11 where FieldType=55;
+update XWCMDBFieldInfo set FieldType=11 where FieldType=55;
+update XWCMViewFieldInfo set FieldType=11 where FieldType=55;
 # mw_复杂编辑器 FieldType 由 63 变为 12
-update trs_data_migration.XWCMDBFieldInfo set FieldType=12 where FieldType=63;
-update trs_data_migration.XWCMViewFieldInfo set FieldType=12 where FieldType=63;
+update XWCMDBFieldInfo set FieldType=12 where FieldType=63;
+update XWCMViewFieldInfo set FieldType=12 where FieldType=63;

TRS.WCM.Developer/贵州项目/1_data_migration_logger.sql

@@ -1,10 +1,6 @@
 
 # 支持断点续迁，需要执行如下 sql
 
-CREATE DATABASE trs_data_migration;
-
-USE trs_data_migration;
-
 CREATE TABLE data_migration_log(
   table_name VARCHAR(100) NOT NULL COMMENT '迁移的表名',
   prev_id BIGINT(20) NOT NULL COMMENT '上一条数据ID',
@@ -12,11 +8,6 @@ CREATE TABLE data_migration_log(
   PRIMARY KEY (table_name)
 );
 
-
-
-
-
-SET GLOBAL log_bin_trust_function_creators = TRUE;
 DROP FUNCTION IF EXISTS build_migration_log_sql;
 DELIMITER $$
 CREATE FUNCTION build_migration_log_sql(table_name VARCHAR(100), id BIGINT(20), curtime datetime)
@@ -26,7 +17,7 @@ CREATE FUNCTION build_migration_log_sql(table_name VARCHAR(100), id BIGINT(20),
 
 
     SET x =  concat('insert into ',
-                    'trs_data_migration.data_migration_log (',
+                    'data_migration_log (',
                     'table_name, ',
                     'prev_id,',
                     'migration_time',

TRS.WCM.Developer/贵州项目/1_data_migration_offset.sql

@@ -1,4 +1,4 @@
-USE trs_data_migration;-- 对于在其他表有外键的记录，
+
 -- 建立offset表，记录迁移的次数、上次迁移的id、偏移量用于增量时能够获取到每次偏移量的变化
 CREATE  TABLE `data_migration_offset`(
   `id` INT(11) NOT NULL COMMENT '数据表ID',

TRS.WCM.Developer/贵州项目/3_sp_data_migration_mas_publishedvideo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_mas_publishedvideo;
 DELIMITER $$
@@ -218,7 +217,7 @@ CREATE PROCEDURE sp_data_migration_mas_publishedvideo(IN prevMasVideoId BIGINT(2
       UNPASSTYPE,
       VIDEOURL,
       YEAR
-    FROM trs_data_migration.mas_publishedvideo
+    FROM mas_publishedvideo
 		ORDER BY ID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -549,7 +548,7 @@ CREATE PROCEDURE sp_data_migration_mas_publishedvideo(IN prevMasVideoId BIGINT(2
                   f_YEAR
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @ID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @ID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_mas_videostream.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_mas_videostream;
 DELIMITER $$
@@ -113,7 +112,7 @@ CREATE PROCEDURE sp_data_migration_mas_videostream(IN prevMasVideoId BIGINT(20),
       TRANSCODECMD,
       TYPE,
       VIDEOID
-    FROM trs_data_migration.mas_videostream
+    FROM mas_videostream
 		ORDER BY ID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -286,7 +285,7 @@ CREATE PROCEDURE sp_data_migration_mas_videostream(IN prevMasVideoId BIGINT(20),
                   f_VIDEOID
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @ID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @ID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_masid.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_masid;
 DELIMITER $$
@@ -35,7 +34,7 @@ CREATE PROCEDURE sp_data_migration_masid(IN prevMasId BIGINT(20),
         LASTMODIFIEDUSER,
         LASTMODIFIEDUSERID,
         srcObjType
-      FROM trs_data_migration.mas_masid
+      FROM mas_masid
       ORDER BY ID asc;
 
     DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -92,7 +91,7 @@ CREATE PROCEDURE sp_data_migration_masid(IN prevMasId BIGINT(20),
                     f_srcObjType
                   );
 
-            SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @ID, now());
+            SET @log_sql = build_migration_log_sql(migr_table_name, @ID, now());
             prepare stmt from @log_sql;
             EXECUTE stmt;
             deallocate prepare stmt;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_masvideo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_masvideo;
 DELIMITER $$
@@ -218,7 +217,7 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
       UNPASSTYPE,
       VIDEOURL,
       YEAR
-    FROM trs_data_migration.mas_masvideo
+    FROM mas_masvideo
 		ORDER BY ID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -549,7 +548,7 @@ CREATE PROCEDURE sp_data_migration_masvideo(IN prevMasVideoId BIGINT(20),
                   f_YEAR
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @ID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @ID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmappendix.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmappendix;
 DELIMITER $$
@@ -69,7 +68,7 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
       ATTRIBUTES,
       0,
       0
-    FROM trs_data_migration.wcmappendix
+    FROM wcmappendix
 		ORDER BY APPENDIXID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -178,12 +177,12 @@ CREATE PROCEDURE sp_data_migration_wcmappendix(IN prevAppendixId BIGINT(20),
                   f_AppFromId
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @APPENDIXID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @APPENDIXID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, appendixIdOffset, prevAppendixId, @APPENDIXID);
+          call setOffset(migr_table_name, appendixIdOffset, prevAppendixId, @APPENDIXID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannel.sql

@@ -1,9 +1,9 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchannel;
 DELIMITER $$
-CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
+CREATE PROCEDURE sp_data_migration_wcmchannel(IN citySuffix VARCHAR(20),
+                                              IN prevChnlId BIGINT(20),
                                               IN siteIdOffset BIGINT(20),
                                               IN channelIdOffset BIGINT(20))
 	BEGIN 
@@ -117,7 +117,7 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
       null,
       null,
       null
-    FROM trs_data_migration.wcmchannel
+    FROM wcmchannel
 		ORDER BY channelid asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -311,12 +311,12 @@ CREATE PROCEDURE sp_data_migration_wcmchannel(IN prevChnlId BIGINT(20),
                   f_CHNLDESCPINYIN
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CHANNELID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @CHANNELID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, channelIdOffset, prevChnlId, @CHANNELID);
+          call setOffset(migr_table_name, channelIdOffset, prevChnlId, @CHANNELID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannelchildindexquote.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchannelchildindexquote;
 DELIMITER $$
@@ -29,7 +28,7 @@ CREATE PROCEDURE sp_data_migration_wcmchannelchildindexquote(IN templateIdOffset
       FOLDERTYPE,
       FOLDERID,
       QUOTECHANNELID
-    FROM trs_data_migration.wcmchannelchildindexquote;
+    FROM wcmchannelchildindexquote;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
 	

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmchannelsyn.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchannelsyn;
 DELIMITER $$
@@ -44,7 +43,7 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
       SYNTYPES,
       OPERAFTER,
       null
-    FROM trs_data_migration.wcmchannelsyn
+    FROM wcmchannelsyn
     ORDER BY CHANNELSYNID ASC ;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -118,12 +117,12 @@ CREATE PROCEDURE sp_data_migration_wcmchannelsyn(IN prevChannelSynId BIGINT(20),
               f_CLASSINFOIDS
             );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CHANNELSYNID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @CHANNELSYNID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, channelSynIdOffset, prevChannelSynId, @CHANNELSYNID);
+          call setOffset(migr_table_name, channelSynIdOffset, prevChannelSynId, @CHANNELSYNID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmfolderpublishconfig.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmfolderpublishconfig;
 DELIMITER $$
@@ -43,7 +42,7 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
       ROOTDOMAIN,
       SITELANGUAGE,
       PAGEENCODING
-    FROM trs_data_migration.wcmfolderpublishconfig
+    FROM wcmfolderpublishconfig
 		ORDER BY FOLDERPUBLISHCONFIGID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -121,12 +120,12 @@ CREATE PROCEDURE sp_data_migration_wcmfolderpublishconfig(IN prevFolderPublishCo
                   f_PAGEENCODING
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @FOLDERPUBLISHCONFIGID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @FOLDERPUBLISHCONFIGID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, folderPublishConfigIdOffset, prevFolderPublishConfigId, @FOLDERPUBLISHCONFIGID);
+          call setOffset(migr_table_name, folderPublishConfigIdOffset, prevFolderPublishConfigId, @FOLDERPUBLISHCONFIGID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplate.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplate;
 DELIMITER $$
@@ -62,7 +61,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
       LASTMODIFIEDUSER,
       LASTMODIFIEDTIME,
       VISUAL
-    FROM trs_data_migration.wcmtemplate
+    FROM wcmtemplate
 		ORDER BY TEMPID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -178,12 +177,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplate(IN prevTemplateId BIGINT(20),
                   f_VISUAL
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @TEMPID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, templateIdOffset, prevTemplateId, @TEMPID);
+          call setOffset(migr_table_name, templateIdOffset, prevTemplateId, @TEMPID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplateargument.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplateargument;
 DELIMITER $$
@@ -37,7 +36,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
       ARGUMENTNAME,
       ARGUMENTVALUE,
       PREFIXOFNAME
-    FROM trs_data_migration.wcmtemplateargument
+    FROM wcmtemplateargument
 		ORDER BY TEMPLATEARGUMENTID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -105,12 +104,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateargument(IN prevTemplateArgId BIGI
                   f_PREFIXOFNAME
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATEARGUMENTID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @TEMPLATEARGUMENTID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, templateArgIdOffset, prevTemplateArgId, @TEMPLATEARGUMENTID);
+          call setOffset(migr_table_name, templateArgIdOffset, prevTemplateArgId, @TEMPLATEARGUMENTID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplateemploy.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplateemploy;
 DELIMITER $$
@@ -35,7 +34,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
       TEMPLATEID,
       TEMPLATETYPE,
       ISDEFAULT
-    FROM trs_data_migration.wcmtemplateemploy
+    FROM wcmtemplateemploy
 		ORDER BY TEMPLATEEMPLOYID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -101,12 +100,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplateemploy(IN prevTemplateEmployId BIG
                   f_ISDEFAULT
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATEEMPLOYID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @TEMPLATEEMPLOYID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, templateEmployIdOffset, prevTemplateEmployId, @TEMPLATEEMPLOYID);
+          call setOffset(migr_table_name, templateEmployIdOffset, prevTemplateEmployId, @TEMPLATEEMPLOYID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplatenest.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplatenest;
 DELIMITER $$
@@ -25,7 +24,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(
       TEMPLATEID,
       NESTEDTEMPLATEID,
       TEMPLATENESTID
-    FROM trs_data_migration.wcmtemplatenest
+    FROM wcmtemplatenest
 		ORDER BY TEMPLATENESTID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -72,12 +71,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatenest(IN prevTemplateNestId BIGINT(
                   f_TEMPLATENESTID
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATENESTID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @TEMPLATENESTID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, templateNestIdOffset, prevTemplateNestId, @TEMPLATENESTID);
+          call setOffset(migr_table_name, templateNestIdOffset, prevTemplateNestId, @TEMPLATENESTID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmtemplatequote.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmtemplatequote;
 DELIMITER $$
@@ -35,7 +34,7 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
       QUOTEDFOLDERID,
       FAMILYINDEX,
       QUOTETYPE
-    FROM trs_data_migration.wcmtemplatequote
+    FROM wcmtemplatequote
 		ORDER BY TEMPLATEQUOTEID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -107,12 +106,12 @@ CREATE PROCEDURE sp_data_migration_wcmtemplatequote(IN prevTemplateQuoteId BIGIN
                   f_QUOTETYPE
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TEMPLATEQUOTEID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @TEMPLATEQUOTEID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, templateQuoteIdOffset, prevTemplateQuoteId, @TEMPLATEQUOTEID);
+          call setOffset(migr_table_name, templateQuoteIdOffset, prevTemplateQuoteId, @TEMPLATEQUOTEID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_wcmwebsite.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmwebsite;
 DELIMITER $$
@@ -102,7 +101,7 @@ CREATE PROCEDURE sp_data_migration_wcmwebsite(IN citySuffix VARCHAR(255), IN pre
       null,
       null,
       0
-		FROM trs_data_migration.wcmwebsite
+		FROM wcmwebsite
 		ORDER BY siteid asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -285,13 +284,13 @@ CREATE PROCEDURE sp_data_migration_wcmwebsite(IN citySuffix VARCHAR(255), IN pre
                   f_AUTOCHECK
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @SITEID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @SITEID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
 
-          call trs_data_migration.setOffset(migr_table_name, siteIdOffset, prevSiteId, @SITEID);
+          call setOffset(migr_table_name, siteIdOffset, prevSiteId, @SITEID);
 
           # 插入 站点分类-站点 关系数据
           set @classificationObjId = (SELECT ifnull(max(classificationObjId), 0) from trs_hycloud_iip.wcmclassificationobj);

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmclassinfo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmclassinfo;
 DELIMITER $$
@@ -36,7 +35,7 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
       CRUSER,
       CRTIME,
       CCODE
-    FROM trs_data_migration.xwcmclassinfo
+    FROM xwcmclassinfo
 		ORDER BY CLASSINFOID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -103,12 +102,12 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfo(IN prevClassInfoId BIGINT(20),
                   f_CCODE
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CLASSINFOID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @CLASSINFOID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, classInfoIdOffset, prevClassInfoId, @CLASSINFOID);
+          call setOffset(migr_table_name, classInfoIdOffset, prevClassInfoId, @CLASSINFOID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmclassinfoview.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmclassinfoview;
 DELIMITER $$
@@ -34,7 +33,7 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
       VIEWID,
       CRUSER,
       CRTIME
-    FROM trs_data_migration.xwcmclassinfoview
+    FROM xwcmclassinfoview
 		ORDER BY CLASSINFOVIEWID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -92,12 +91,12 @@ CREATE PROCEDURE sp_data_migration_xwcmclassinfoview(IN prevClassInfoViewId BIGI
                   f_CRTIME
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @CLASSINFOVIEWID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @CLASSINFOVIEWID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, classInfoViewIdOffset, prevClassInfoViewId, @CLASSINFOVIEWID);
+          call setOffset(migr_table_name, classInfoViewIdOffset, prevClassInfoViewId, @CLASSINFOVIEWID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmdbfieldinfo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmdbfieldinfo;
 DELIMITER $$
@@ -59,7 +58,7 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
       RADORCHK,
       NOTEDIT,
       HIDDENFIELD
-    FROM trs_data_migration.xwcmdbfieldinfo
+    FROM xwcmdbfieldinfo
 		ORDER BY DBFIELDINFOID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -154,12 +153,12 @@ CREATE PROCEDURE sp_data_migration_xwcmdbfieldinfo(IN citySuffix VARCHAR(20),
                   f_HIDDENFIELD
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @DBFIELDINFOID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @DBFIELDINFOID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, fieldIdOffset, prevFieldId, @DBFIELDINFOID);
+          call setOffset(migr_table_name, fieldIdOffset, prevFieldId, @DBFIELDINFOID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmmaterial.sql

@@ -1,4 +1,3 @@
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmmaterial;
 DELIMITER $$
@@ -31,8 +30,8 @@ BEGIN
       b.CrUser,
       b.CrTime
     FROM
-      trs_data_migration.xwcmmaterialquote a
-      LEFT JOIN trs_data_migration.xwcmmaterial b ON a.MATERIALID = b.MATERIALID
+      xwcmmaterialquote a
+      LEFT JOIN xwcmmaterial b ON a.MATERIALID = b.MATERIALID
     WHERE b.MATERIALTYPE IN (1, 2)
     ORDER BY
       a.MATERIALQUOTEID ASC;
@@ -106,12 +105,12 @@ BEGIN
                   f_AppFromId
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @APPENDIXID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @APPENDIXID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, appendixIdOffset, prevAppendixId, @APPENDIXID);
+          call setOffset(migr_table_name, appendixIdOffset, prevAppendixId, @APPENDIXID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmmetaviewemployer.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmmetaviewemployer;
 DELIMITER $$
@@ -35,7 +34,7 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
       METAVIEWEMPLOYERID,
       101,
       CHANNELID
-    FROM trs_data_migration.xwcmmetaviewemployer
+    FROM xwcmmetaviewemployer
 		ORDER BY METAVIEWEMPLOYERID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -99,12 +98,12 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewemployer(IN prevMetaViewEmployerI
                   f_EmployerId
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @METAVIEWEMPLOYERID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @METAVIEWEMPLOYERID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, metaViewEmployerIdOffset, prevMetaViewEmployerId, @METAVIEWEMPLOYERID);
+          call setOffset(migr_table_name, metaViewEmployerIdOffset, prevMetaViewEmployerId, @METAVIEWEMPLOYERID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmmetaviewfieldgroup.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmmetaviewfieldgroup;
 DELIMITER $$
@@ -32,7 +31,7 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
       CRUSER,
       CRTIME,
       GROUPORDER
-    FROM trs_data_migration.xwcmmetaviewfieldgroup
+    FROM xwcmmetaviewfieldgroup
 		ORDER BY METAVIEWFIELDGROUPID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -86,7 +85,7 @@ CREATE PROCEDURE sp_data_migration_xwcmmetaviewfieldgroup(IN prevMetaViewFieldGr
                   f_GROUPORDER
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @METAVIEWFIELDGROUPID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @METAVIEWFIELDGROUPID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmtableinfo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmtableinfo;
 DELIMITER $$
@@ -34,7 +33,7 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
       CRTIME,
       OWNERTYPE,
       OWNERID
-    FROM trs_data_migration.xwcmtableinfo
+    FROM xwcmtableinfo
 		ORDER BY TABLEINFOID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -90,12 +89,12 @@ CREATE PROCEDURE sp_data_migration_xwcmtableinfo(IN citySuffix VARCHAR(20),
                   f_OWNERID
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @TABLEINFOID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @TABLEINFOID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, tableInfoIdOffset, prevTableInfoId, @TABLEINFOID);
+          call setOffset(migr_table_name, tableInfoIdOffset, prevTableInfoId, @TABLEINFOID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmviewfieldinfo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmviewfieldinfo;
 DELIMITER $$
@@ -113,7 +112,7 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
       FieldWidth,
       FieldClass,
       ISONLYSITE
-    FROM trs_data_migration.xwcmviewfieldinfo
+    FROM xwcmviewfieldinfo
 		ORDER BY VIEWFIELDINFOID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -288,12 +287,12 @@ CREATE PROCEDURE sp_data_migration_xwcmviewfieldinfo(IN citySuffix VARCHAR(20),
                   f_ISONLYSITE
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @VIEWFIELDINFOID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @VIEWFIELDINFOID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, viewFieldInfoIdOffset, prevViewFieldInfoId, @VIEWFIELDINFOID);
+          call setOffset(migr_table_name, viewFieldInfoIdOffset, prevViewFieldInfoId, @VIEWFIELDINFOID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/3_sp_data_migration_xwcmviewinfo.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmviewinfo;
 DELIMITER $$
@@ -58,7 +57,7 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
       HIDDENIMGAPPENDIX,
       HIDDENLINKAPPENDIX,
       null
-    FROM trs_data_migration.xwcmviewinfo
+    FROM xwcmviewinfo
 		ORDER BY VIEWINFOID asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -174,12 +173,12 @@ CREATE PROCEDURE sp_data_migration_xwcmviewinfo(IN citySuffix VARCHAR(20),
           EXECUTE stmt;
           deallocate prepare stmt;
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @VIEWINFOID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @VIEWINFOID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, viewIdOffset, prevViewId, @VIEWINFOID);
+          call setOffset(migr_table_name, viewIdOffset, prevViewId, @VIEWINFOID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/4_sp_city_n.sql

@@ -1,4 +1,3 @@
-USE trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_city_n;
 DELIMITER $$
@@ -82,7 +81,7 @@ CREATE PROCEDURE sp_city_n(IN n INT)
 
 
     call sp_data_migration_wcmwebsite(@citySuffix, @prevSiteId, @siteIdOffset);
-    call sp_data_migration_wcmchannel(@prevChannelId, @siteIdOffset, @channelIdOffset);
+    call sp_data_migration_wcmchannel(@citySuffix, @prevChannelId, @siteIdOffset, @channelIdOffset);
     call sp_data_migration_wcmchannelsyn(@prevChannelSynId, @channelSynIdOffset, @channelIdOffset);
     call sp_data_migration_xwcmtableinfo(@citySuffix, @prevTableInfoId, @tableInfoIdOffset);
     call sp_data_migration_xwcmclassinfo(@prevClassInfoId, @classInfoIdOffset);

TRS.WCM.Developer/贵州项目/5_caller.sql

@@ -5,18 +5,4 @@
 # 迁移第1个wcm节点
 CALL trs_data_migration.sp_city_n(1);
 
-# 迁移第2个wcm节点
-#CALL trs_data_migration.sp_city_n(2);
-
-# 迁移第3个wcm节点
-#CALL trs_data_migration.sp_city_n(3);
-
-# 迁移第4个wcm节点
-#CALL trs_data_migration.sp_city_n(4);
-
-# 迁移第5个wcm节点
-#CALL trs_data_migration.sp_city_n(5);
-
-# 迁移第6个wcm节点
-#CALL trs_data_migration.sp_city_n(6);
 

TRS.WCM.Developer/贵州项目/6_recover.sql

@@ -23,6 +23,7 @@ CREATE PROCEDURE sp_recover_city()
 	  IF (@view_offset_num > 0)
 	    then
         delete from trs_hycloud_iip.xwcmviewinfo where viewinfoid > @view_offset_num;
+        delete from trs_hycloud_iip.xwcmmetaviewfieldgroup where METAVIEWID > @view_offset_num;
     END IF ;
 
 
@@ -84,6 +85,7 @@ CREATE PROCEDURE sp_recover_city()
 	  IF (@wcmtemplate_offset_num > 0)
 	    then
       delete from trs_hycloud_iip.wcmtemplate where tempid > @wcmtemplate_offset_num;
+      delete from trs_hycloud_iip.wcmchannelchildindexquote where TEMPLATEID > @wcmtemplate_offset_num;
     END IF ;
 
     SET @config_offset_num = ifnull((SELECT max(offset_num) FROM data_migration_offset WHERE table_name = 'wcmfolderpublishconfig'), 0);

TRS.WCM.Developer/贵州项目/7_xwcmmaterial.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_xwcmmaterial;
 DELIMITER $$
@@ -32,8 +31,8 @@ CREATE PROCEDURE sp_data_migration_xwcmmaterial(IN prevAppendixId BIGINT(20),
       b.CrUser,
       b.CrTime
     FROM
-      trs_data_migration.xwcmmaterialquote a
-      LEFT JOIN trs_data_migration.xwcmmaterial b ON a.MATERIALID = b.MATERIALID
+      xwcmmaterialquote a
+      LEFT JOIN xwcmmaterial b ON a.MATERIALID = b.MATERIALID
     WHERE b.MATERIALTYPE IN (1, 2)
     ORDER BY
       a.MATERIALQUOTEID ASC;
@@ -107,11 +106,12 @@ CREATE PROCEDURE sp_data_migration_xwcmmaterial(IN prevAppendixId BIGINT(20),
                   f_AppFromId
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @APPENDIXID);
+          SET @log_sql = build_migration_log_sql(migr_table_name, @APPENDIXID);
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
+          call setOffset(migr_table_name, appendixIdOffset, prevAppendixId, @APPENDIXID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/全量迁移/3_sp_data_migration_wcmchnldoc.sql

@@ -1,4 +1,3 @@
-USE trs_data_migration;
 DROP PROCEDURE
 IF
 	EXISTS sp_data_migration_wcmchnldoc;
@@ -98,7 +97,7 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc (
 	0,
 	NULL
 	FROM
-		trs_data_migration.wcmchnldoc
+		wcmchnldoc
 	WHERE
 		CHNLID > 0
 		AND SITEID > 0
@@ -108,14 +107,14 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc (
 
 	update trs_hycloud_iip.wcmchnldoc set PUBSTATUS = 1 where RECID > prevRecId and DOCSTATUS = 10;
 
-	SET @maxRECID = IFNULL((SELECT MAX(recId) from trs_data_migration.wcmchnldoc), 0 );
+	SET @maxRECID = IFNULL((SELECT MAX(recId) from wcmchnldoc), 0 );
 
-	SET @log_sql = trs_data_migration.build_migration_log_sql ( migr_table_name, @maxRECID, now() );
+	SET @log_sql = build_migration_log_sql ( migr_table_name, @maxRECID, now() );
 	PREPARE stmt FROM @log_sql;
 	EXECUTE stmt;
 	DEALLOCATE PREPARE stmt;
 
-	CALL trs_data_migration.setOffset ( migr_table_name, recIdOffset, prevRecId, @maxRECID );
+	CALL setOffset ( migr_table_name, recIdOffset, prevRecId, @maxRECID );
 
 	SELECT
 		concat( '完成迁移 ', migr_table_name ) info;

TRS.WCM.Developer/贵州项目/全量迁移/3_sp_data_migration_wcmdocument.sql

@@ -1,4 +1,4 @@
-USE trs_data_migration;
+
 DROP PROCEDURE
 IF
 	EXISTS sp_data_migration_wcmdocument;
@@ -179,19 +179,19 @@ CREATE PROCEDURE sp_data_migration_wcmdocument (
 	0,
 	DOCID + docIdOffset
 	FROM
-		trs_data_migration.wcmdocument
+		wcmdocument
 	where DOCID > prevDocId
 	ORDER BY
 		docid ASC;
 
-	SET @maxDOCID = IFNULL( ( SELECT MAX( DOCID ) FROM trs_data_migration.wcmdocument ), 0 );
+	SET @maxDOCID = IFNULL( ( SELECT MAX( DOCID ) FROM wcmdocument ), 0 );
 
-	SET @log_sql = trs_data_migration.build_migration_log_sql ( migr_table_name, @maxDOCID, now( ) );
+	SET @log_sql = build_migration_log_sql ( migr_table_name, @maxDOCID, now( ) );
 	PREPARE stmt FROM @log_sql;
 	EXECUTE stmt;
 	DEALLOCATE PREPARE stmt;
 
-	CALL trs_data_migration.setOffset ( migr_table_name, docIdOffset, prevDocId, @maxDOCID );
+	CALL setOffset ( migr_table_name, docIdOffset, prevDocId, @maxDOCID );
 	SELECT
 		concat( '完成迁移 ', migr_table_name ) info;
 

TRS.WCM.Developer/贵州项目/全量迁移/3_sp_data_migration_wcmmetatable.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmmetatable;
 DELIMITER $$
@@ -20,7 +19,7 @@ CREATE PROCEDURE sp_data_migration_wcmmetatable(IN citySuffix VARCHAR(20),
       SELECT
         TABLEINFOID,
         TABLENAME
-      FROM trs_data_migration.xwcmtableinfo
+      FROM xwcmtableinfo
       ORDER BY TABLEINFOID asc;
 
     DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -98,7 +97,7 @@ CREATE PROCEDURE sp_data_migration_wcmmetatable(IN citySuffix VARCHAR(20),
               deallocate prepare stmt;
             end if ;
 
-            SET @log_sql = trs_data_migration.build_migration_log_sql(concat('wcmmetatable', f_TABLENAME, citySuffix), @meta_data_id, now());
+            SET @log_sql = build_migration_log_sql(concat('wcmmetatable', f_TABLENAME, citySuffix), @meta_data_id, now());
             prepare stmt from @log_sql;
             EXECUTE stmt;
             deallocate prepare stmt;

TRS.WCM.Developer/贵州项目/增量迁移/3_sp_data_migration_wcmchnldoc.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmchnldoc;
 DELIMITER $$
@@ -104,7 +103,7 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
       0,
       null
     -- 迭代十五才有的字段 ACTIONUSER
-    FROM trs_data_migration.wcmchnldoc
+    FROM wcmchnldoc
     where CHNLID > 0 and SITEID > 0
     ORDER BY RECID ASC ;
 
@@ -267,12 +266,12 @@ CREATE PROCEDURE sp_data_migration_wcmchnldoc(IN prevRecId BIGINT(20),
               -- 迭代十五才有的字段 f_ACTIONUSER
             );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @RECID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @RECID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, recIdOffset, prevRecId, @RECID);
+          call setOffset(migr_table_name, recIdOffset, prevRecId, @RECID);
     END IF ;
 
 		FETCH cur INTO

TRS.WCM.Developer/贵州项目/增量迁移/3_sp_data_migration_wcmdocument.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmdocument;
 DELIMITER $$
@@ -183,7 +182,7 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
       0,
       0,
       0
-		FROM trs_data_migration.wcmdocument
+		FROM wcmdocument
 		ORDER BY docid asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -474,12 +473,12 @@ CREATE PROCEDURE sp_data_migration_wcmdocument(IN prevDocId BIGINT(20),
                 f_OriginDocId
                 );
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(migr_table_name, @DOCID, now());
+          SET @log_sql = build_migration_log_sql(migr_table_name, @DOCID, now());
 
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
-          call trs_data_migration.setOffset(migr_table_name, docIdOffset, prevDocId, @DOCID);
+          call setOffset(migr_table_name, docIdOffset, prevDocId, @DOCID);
     END IF ;
 
 		FETCH cur_doc INTO

TRS.WCM.Developer/贵州项目/增量迁移/3_sp_data_migration_wcmmetablexx.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmmetablexx;
 DELIMITER $$
@@ -19,7 +18,7 @@ CREATE PROCEDURE sp_data_migration_wcmmetablexx(IN metableName VARCHAR(255),
 		SELECT
       channel_id,
       metadat_id
-    FROM trs_data_migration.meta_data
+    FROM meta_data
 		ORDER BY metadat_id asc;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET isover = 1;
@@ -53,12 +52,12 @@ CREATE PROCEDURE sp_data_migration_wcmmetablexx(IN metableName VARCHAR(255),
           EXECUTE stmt;
           deallocate prepare stmt;
 
-          SET @log_sql = trs_data_migration.build_migration_log_sql(metableName, @metadataId, now());
+          SET @log_sql = build_migration_log_sql(metableName, @metadataId, now());
           prepare stmt from @log_sql;
           EXECUTE stmt;
           deallocate prepare stmt;
 
-          call trs_data_migration.setOffset(metableName, docIdOffset, prevDocId, @metadataId);
+          call setOffset(metableName, docIdOffset, prevDocId, @metadataId);
 
     END IF ;
 

TRS.WCM.Developer/贵州项目/增量迁移/3_sp_data_migration_wcmmetatable.sql

@@ -1,5 +1,4 @@
 
-use trs_data_migration;
 
 DROP PROCEDURE IF EXISTS sp_data_migration_wcmmetatable;
 DELIMITER $$