Changeset: a576b9a649d5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a576b9a649d5
Modified Files:
        sql/ChangeLog.Aug2024
        sql/backends/monet5/sql_upgrades.c
Branch: Aug2024
Log Message:

Exit (GDKfatal) when upgrade fails, don't try to limp on after partial upgrade.


diffs (88 lines):

diff --git a/sql/ChangeLog.Aug2024 b/sql/ChangeLog.Aug2024
--- a/sql/ChangeLog.Aug2024
+++ b/sql/ChangeLog.Aug2024
@@ -1,6 +1,11 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Thu Oct 17 2024 Sjoerd Mullender <[email protected]>
+- When for whatever reason the upgrade code produces an error, we now
+  exit the server.  Before the server would limp on with what is basically
+  a broken database.
+
 * Thu Sep 26 2024 Martin van Dinther <[email protected]>
 - Improved the violation message of CHECK constraints when violated. It
   now includes the schema name of the constraint and the check clause.
diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -4374,7 +4374,6 @@ SQLupgrades(Client c, mvc *m)
        sql_schema *s = mvc_bind_schema(m, "sys");
 
        if ((err = check_sys_tables(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
@@ -4385,60 +4384,51 @@ SQLupgrades(Client c, mvc *m)
                m->session->status = 0; /* if the function was not found clean 
the error */
                m->errstr[0] = '\0';
                if ((err = sql_update_hugeint(c, m)) != NULL) {
-                       TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                        goto handle_error;
                }
        }
 #endif
 
        if ((err = sql_update_jan2022(c, m)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_sep2022(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_jun2023(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_dec2023_geom(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_jun2023_sp3(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_dec2023(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_dec2023_sp1(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_dec2023_sp4(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        if ((err = sql_update_aug2024(c, m, s)) != NULL) {
-               TRC_CRITICAL(SQL_PARSER, "%s\n", err);
                goto handle_error;
        }
 
        return 0;
 
 handle_error:
+       GDKfatal("%s\n", err);
        freeException(err);
        return -1;
 }
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to