IngresDB: cats: remove remaining mentions of INGRES db

bareos · Feb 27, 2023 · 8d7fffb · 8d7fffb
1 parent 85df1c0
commit 8d7fffb
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 41 deletions.
diff --git a/core/src/cats/bvfs.cc b/core/src/cats/bvfs.cc
@@ -26,7 +26,7 @@
  */
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats/cats.h"
 #  include "cats/sql.h"
@@ -878,5 +878,4 @@ bool Bvfs::compute_restore_list(char* fileid,
   return retval;
 }
 
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/cats.cc b/core/src/cats/cats.cc
@@ -28,7 +28,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "sql_pooling.h"
@@ -97,16 +97,12 @@ const char* BareosDb::GetType(void)
       return "MySQL";
     case SQL_INTERFACE_TYPE_POSTGRESQL:
       return "PostgreSQL";
-    case SQL_INTERFACE_TYPE_INGRES:
-      return "Ingres";
     case SQL_INTERFACE_TYPE_DBI:
       switch (db_type_) {
         case SQL_TYPE_MYSQL:
           return "DBI:MySQL";
         case SQL_TYPE_POSTGRESQL:
           return "DBI:PostgreSQL";
-        case SQL_TYPE_INGRES:
-          return "DBI:Ingres";
         default:
           return "DBI:Unknown";
       }
@@ -233,5 +229,4 @@ void BareosDb::UnescapeObject(JobControlRecord*,
   dest[expected_len] = '\0';
 }
 
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
@@ -447,7 +447,6 @@ typedef enum
 {
   SQL_INTERFACE_TYPE_MYSQL = 0,
   SQL_INTERFACE_TYPE_POSTGRESQL = 1,
-  SQL_INTERFACE_TYPE_INGRES = 3,
   SQL_INTERFACE_TYPE_DBI = 4,
   SQL_INTERFACE_TYPE_UNKNOWN = 99
 } SQL_INTERFACETYPE;
@@ -456,7 +455,6 @@ typedef enum
 {
   SQL_TYPE_MYSQL = 0,
   SQL_TYPE_POSTGRESQL = 1,
-  SQL_TYPE_INGRES = 3,
   SQL_TYPE_UNKNOWN = 99
 } SQL_DBTYPE;
 

diff --git a/core/src/cats/cats_backends.cc b/core/src/cats/cats_backends.cc
@@ -28,7 +28,7 @@
 #include "include/bareos.h"
 #include "lib/edit.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 
@@ -298,5 +298,4 @@ BareosDb* db_init_database(JobControlRecord* jcr,
 
 void DbFlushBackends(void) {}
 #  endif /* HAVE_DYNAMIC_CATS_BACKENDS */
-#endif   /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-            HAVE_DBI */
+#endif   /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql.cc b/core/src/cats/sql.cc
@@ -32,7 +32,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "lib/edit.h"
@@ -909,5 +909,4 @@ void DbDebugPrint(JobControlRecord* jcr, FILE* fp)
 
   mdb->DbDebugPrint(fp);
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_create.cc b/core/src/cats/sql_create.cc
@@ -30,7 +30,7 @@
 
 static const int dbglevel = 100;
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "lib/edit.h"
@@ -1392,5 +1392,4 @@ bool BareosDb::CreateTapealertStatistics(JobControlRecord* jcr,
     return true;
   }
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_delete.cc b/core/src/cats/sql_delete.cc
@@ -28,7 +28,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "lib/edit.h"
@@ -264,4 +264,4 @@ void BareosDb::PurgeJobs(const char* jobids)
   Mmsg(query, "DELETE FROM Job WHERE JobId IN (%s)", jobids);
   SqlQuery(query.c_str());
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL */
diff --git a/core/src/cats/sql_find.cc b/core/src/cats/sql_find.cc
@@ -32,7 +32,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "lib/edit.h"
@@ -621,5 +621,4 @@ int BareosDb::FindNextVolume(JobControlRecord* jcr,
   Dmsg1(050, "Rtn numrows=%d\n", num_rows);
   return num_rows;
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_get.cc b/core/src/cats/sql_get.cc
@@ -32,7 +32,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "sql.h"
@@ -1910,5 +1910,4 @@ bool BareosDb::VerifyMediaIdsFromSingleStorage(JobControlRecord* jcr,
 }
 
 
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_list.cc b/core/src/cats/sql_list.cc
@@ -28,7 +28,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "lib/edit.h"
@@ -788,5 +788,4 @@ void BareosDb::ListFilesets(JobControlRecord* jcr,
 
   SqlFreeResult();
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_pooling.cc b/core/src/cats/sql_pooling.cc
@@ -28,7 +28,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "cats_backends.h"
@@ -148,5 +148,4 @@ void DbSqlClosePooledConnection(JobControlRecord* jcr, BareosDb* mdb, bool)
   mdb->CloseDatabase(jcr);
 }
 
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_query.cc b/core/src/cats/sql_query.cc
@@ -27,7 +27,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 
@@ -155,5 +155,4 @@ bool BareosDb::SqlQuery(const char* query,
 
   return retval;
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */
diff --git a/core/src/cats/sql_update.cc b/core/src/cats/sql_update.cc
@@ -28,7 +28,7 @@
 
 #include "include/bareos.h"
 
-#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+#if HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI
 
 #  include "cats.h"
 #  include "lib/edit.h"
@@ -573,5 +573,4 @@ void BareosDb::UpgradeCopies(const char* jobids)
 
   SqlQuery("DROP TABLE cpy_tmp");
 }
-#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || \
-          HAVE_DBI */
+#endif /* HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_DBI */