Skip to content

Commit 6dea316

Browse files
committed
12.8.11 Release
1 parent 69c6278 commit 6dea316

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

prodict/dump/_lodsddl.p

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
tmasood 02/22/21 Display a message when inactive index added to an existing table
6363
tmasood 03/03/21 Abort the load when selected section missing from df file
6464
tmasood 03/10/22 Fixed the error 16621 while loading encryption details of new Index
65-
tmasood 07/24/23 Added support for loading DDM schema
65+
tmasood 07/24/23 Added support for loading DDM schema
66+
tmasood 12/08/25 Fixed the error 91 when load df has some warnings
6667
*/
6768

6869
USING Progress.Database.*.
@@ -1474,6 +1475,7 @@ REPEAT ON ERROR UNDO,RETRY ON ENDKEY UNDO, LEAVE:
14741475
lEndOffline = FALSE
14751476
lBeginDDMSection = FALSE
14761477
lEndDDMSection = FALSE
1478+
xwarn = FALSE
14771479
ierror = 0
14781480
ilin = ?.
14791481

@@ -3355,7 +3357,15 @@ REPEAT ON ERROR UNDO,RETRY ON ENDKEY UNDO, LEAVE:
33553357
MESSAGE msg2 VIEW-AS ALERT-BOX ERROR.
33563358
IF user_env[6] = "f" OR user_env[6] = "b" THEN
33573359
MESSAGE msg3 dbload-e msg4 VIEW-AS ALERT-BOX INFORMATION.
3358-
END.
3360+
END.
3361+
ELSE IF xwarn THEN DO:
3362+
MESSAGE msg3 dbload-e msg4 VIEW-AS ALERT-BOX INFORMATION.
3363+
IF lEndOffline OR lEndDDMSection OR (NOT loadBySection) THEN DO:
3364+
HIDE MESSAGE no-pause.
3365+
RUN adecomm/_setcurs.p ("").
3366+
LEAVE section_loop.
3367+
END.
3368+
END.
33593369
END.
33603370
ELSE
33613371
DO:
@@ -3368,6 +3378,9 @@ REPEAT ON ERROR UNDO,RETRY ON ENDKEY UNDO, LEAVE:
33683378
MESSAGE msg3 dbload-e msg4.
33693379

33703380
PAUSE.
3381+
/* when warnings occur and load is completed, leave the loop gracefully */
3382+
IF xwarn AND (lEndOffline OR lEndDDMSection OR (NOT loadBySection)) THEN
3383+
LEAVE section_loop.
33713384
END.
33723385
END. /* TERMINAL <> "" and not dictloader */
33733386
/* batch or dictloader avoid undo if force commit */

0 commit comments

Comments
 (0)