Change assertions to only prevent downgrading

mumble-voip · Dec 28, 2023 · a26dd78 · a26dd78
1 parent 496f122
commit a26dd78
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/src/murmur/database/ACLTable.cpp b/src/murmur/database/ACLTable.cpp
@@ -374,7 +374,7 @@ namespace server {
  void ACLTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/BanTable.cpp b/src/murmur/database/BanTable.cpp
@@ -373,7 +373,7 @@ namespace server {
  void BanTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/ChannelLinkTable.cpp b/src/murmur/database/ChannelLinkTable.cpp
@@ -209,7 +209,7 @@ namespace server {
  void ChannelLinkTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/ChannelListenerTable.cpp b/src/murmur/database/ChannelListenerTable.cpp
@@ -286,7 +286,7 @@ namespace server {
  void ChannelListenerTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 9) {

diff --git a/src/murmur/database/ChannelPropertyTable.cpp b/src/murmur/database/ChannelPropertyTable.cpp
@@ -176,7 +176,7 @@ namespace server {
  void ChannelPropertyTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/ChannelTable.cpp b/src/murmur/database/ChannelTable.cpp
@@ -246,7 +246,7 @@ namespace server {
  void ChannelTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/ConfigTable.cpp b/src/murmur/database/ConfigTable.cpp
@@ -168,7 +168,7 @@ namespace server {
  void ConfigTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/GroupMemberTable.cpp b/src/murmur/database/GroupMemberTable.cpp
@@ -179,7 +179,7 @@ namespace server {
  void GroupMemberTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/GroupTable.cpp b/src/murmur/database/GroupTable.cpp
@@ -335,7 +335,7 @@ namespace server {
  void GroupTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/LogTable.cpp b/src/murmur/database/LogTable.cpp
@@ -158,7 +158,7 @@ namespace server {
  void LogTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/ServerTable.cpp b/src/murmur/database/ServerTable.cpp
@@ -134,7 +134,7 @@ namespace server {
  void ServerTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/UserPropertyTable.cpp b/src/murmur/database/UserPropertyTable.cpp
@@ -214,7 +214,7 @@ namespace server {
  void UserPropertyTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 10) {

diff --git a/src/murmur/database/UserTable.cpp b/src/murmur/database/UserTable.cpp
@@ -694,7 +694,7 @@ namespace server {
  void UserTable::migrate(unsigned int fromSchemeVersion, unsigned int toSchemeVersion) {
  // Note: Always hard-code old table and column names in this function in order to ensure that this
  // migration path always stays the same regardless of whether the respective named constants change.
- assert(fromSchemeVersion < toSchemeVersion);
+ assert(fromSchemeVersion <= toSchemeVersion);
 
  try {
  if (fromSchemeVersion < 8) {