neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hlr/+/15914 )
Change subject: hlr db schema 3: hlr_number -> msc_number
......................................................................
hlr db schema 3: hlr_number -> msc_number
The osmo-hlr DB schema indicates a hlr_number column and references it as 3GPP
TS 23.008 chapter 2.4.6. However, chapter 2.4.6 refers to the "MSC number",
while the "HLR number" is chapter 2.4.7.
Taking a closer look, 2.4.6 says "The MSC number is [...] stored in the HLR",
while 2.4.7 says "The HLR number may be stored in the VLR". As quite obvious,
the HLR does not store the HLR number. This was a typo from the start.
The osmo-hlr code base so far does not use the hlr_number column at all, so we
get away with renaming the column without any effects on the code base.
However, let's rather make this a new schema version to be safe.
Change-Id: I527e8627b24b79f3e9eec32675c7f5a3a6d25440
---
M doc/manuals/chapters/subscribers.adoc
M sql/hlr.sql
M src/db.c
M tests/db_upgrade/db_upgrade_test.ok
4 files changed, 50 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/15914/1
diff --git a/doc/manuals/chapters/subscribers.adoc
b/doc/manuals/chapters/subscribers.adoc
index e09e99a..ab41b0f 100644
--- a/doc/manuals/chapters/subscribers.adoc
+++ b/doc/manuals/chapters/subscribers.adoc
@@ -52,7 +52,7 @@
|aud3g.ind_bitlen|5|Nr of index bits at lower SQN end
|apn||
|vlr_number||3GPP TS 23.008 chapter 2.4.5
-|hlr_number||3GPP TS 23.008 chapter 2.4.6
+|msc_number||3GPP TS 23.008 chapter 2.4.6
|sgsn_number||3GPP TS 23.008 chapter 2.4.8.1
|sgsn_address||3GPP TS 23.008 chapter 2.13.10
|ggsn_number||3GPP TS 23.008 chapter 2.4.8.2
diff --git a/sql/hlr.sql b/sql/hlr.sql
index 10838f2..a627f0c 100644
--- a/sql/hlr.sql
+++ b/sql/hlr.sql
@@ -12,7 +12,7 @@
-- Chapter 2.4.5
vlr_number VARCHAR(15),
-- Chapter 2.4.6
- hlr_number VARCHAR(15),
+ msc_number VARCHAR(15),
-- Chapter 2.4.8.1
sgsn_number VARCHAR(15),
-- Chapter 2.13.10
@@ -76,4 +76,4 @@
-- Set HLR database schema version number
-- Note: This constant is currently duplicated in src/db.c and must be kept in
sync!
-PRAGMA user_version = 2;
+PRAGMA user_version = 3;
diff --git a/src/db.c b/src/db.c
index 31c4ba5..4ae491e 100644
--- a/src/db.c
+++ b/src/db.c
@@ -28,7 +28,7 @@
#include "db_bootstrap.h"
/* This constant is currently duplicated in sql/hlr.sql and must be kept in
sync! */
-#define CURRENT_SCHEMA_VERSION 2
+#define CURRENT_SCHEMA_VERSION 3
#define SEL_COLUMNS \
"id," \
@@ -329,6 +329,40 @@
return rc;
}
+static int db_upgrade_v3(struct db_context *dbc)
+{
+ sqlite3_stmt *stmt;
+ int rc;
+ const char *update_stmt_sql = "ALTER TABLE subscriber RENAME COLUMN
hlr_number TO msc_number";
+ const char *set_schema_version_sql = "PRAGMA user_version = 3";
+
+ rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL);
+ if (rc != SQLITE_OK) {
+ LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n",
update_stmt_sql);
+ return rc;
+ }
+ rc = sqlite3_step(stmt);
+ db_remove_reset(stmt);
+ sqlite3_finalize(stmt);
+ if (rc != SQLITE_DONE) {
+ LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to
version 3\n");
+ return rc;
+ }
+
+ rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt,
NULL);
+ if (rc != SQLITE_OK) {
+ LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n",
set_schema_version_sql);
+ return rc;
+ }
+ rc = sqlite3_step(stmt);
+ if (rc != SQLITE_DONE)
+ LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to
version 3\n");
+
+ db_remove_reset(stmt);
+ sqlite3_finalize(stmt);
+ return rc;
+}
+
static int db_get_user_version(struct db_context *dbc)
{
const char *user_version_sql = "PRAGMA user_version";
@@ -459,6 +493,15 @@
}
version = 2;
/* fall through */
+ case 2:
+ rc = db_upgrade_v3(dbc);
+ if (rc != SQLITE_DONE) {
+ LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB
schema to version 3: (rc=%d) %s\n",
+ rc, sqlite3_errmsg(dbc->db));
+ goto out_free;
+ }
+ version = 3;
+ /* fall through */
/* case N: ... */
default:
break;
diff --git a/tests/db_upgrade/db_upgrade_test.ok
b/tests/db_upgrade/db_upgrade_test.ok
index 7fa1258..1a1d1b8 100644
--- a/tests/db_upgrade/db_upgrade_test.ok
+++ b/tests/db_upgrade/db_upgrade_test.ok
@@ -87,7 +87,7 @@
DMAIN hlr starting
DDB using database: <PATH>test.db
DDB Database <PATH>test.db' has HLR DB schema version 0
-DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 2
+DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 3
DMAIN Cmdline option --db-check: Database was opened successfully, quitting.
Resulting db:
@@ -105,7 +105,7 @@
-- Chapter 2.4.5
vlr_number VARCHAR(15),
-- Chapter 2.4.6
- hlr_number VARCHAR(15),
+ msc_number VARCHAR(15),
-- Chapter 2.4.8.1
sgsn_number VARCHAR(15),
-- Chapter 2.13.10
@@ -176,5 +176,5 @@
rc = 0
DMAIN hlr starting
DDB using database: <PATH>test.db
-DDB Database <PATH>test.db' has HLR DB schema version 2
+DDB Database <PATH>test.db' has HLR DB schema version 3
DMAIN Cmdline option --db-check: Database was opened successfully, quitting.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15914
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I527e8627b24b79f3e9eec32675c7f5a3a6d25440
Gerrit-Change-Number: 15914
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-MessageType: newchange
