[sqlops] migrate DB stuff from DBops to SQLops

OpenSIPS · Apr 18, 2024 · 935b70b · 935b70b
1 parent 6bb1a90
commit 935b70b
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 68 deletions.
diff --git a/db/schema/opensips-dbops.xml → db/schema/opensips-sqlops.xml b/db/schema/opensips-dbops.xml → db/schema/opensips-sqlops.xml
@@ -7,6 +7,6 @@
 ]>
 
 <database xmlns:xi="http://www.w3.org/2001/XInclude">
-    <name>DB Operations</name>
+    <name>SQL Operations</name>
     <xi:include href="usr_preferences.xml"/>
 </database>
diff --git a/db/schema/usr_preferences.xml b/db/schema/usr_preferences.xml
@@ -12,7 +12,7 @@
     <version>3</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
-        <db:para>This table us used by the DBops module to implement Attribute Value Pairs (AVP's). More information about the DBops module can be found at: &OPENSIPS_MOD_DOC;dbops.html
+        <db:para>This table us used by the SQLops module to implement Attribute Value Pairs (AVP's). More information about the SQLops module can be found at: &OPENSIPS_MOD_DOC;sqlops.html
         </db:para>
     </description>
 

diff --git a/scripts/mysql/dbops-create.sql → scripts/mysql/sqlops-create.sql b/scripts/mysql/dbops-create.sql → scripts/mysql/sqlops-create.sql
diff --git a/scripts/oracle/dbops-create.sql → scripts/oracle/sqlops-create.sql b/scripts/oracle/dbops-create.sql → scripts/oracle/sqlops-create.sql
diff --git a/scripts/pi_http/pi_framework.xml b/scripts/pi_http/pi_framework.xml
@@ -113,19 +113,6 @@
 		<column><field>start_ts</field><type>DB_INT</type></column>
 		<column><field>end_ts</field><type>DB_INT</type></column>
 	</db_table>
-	<!-- Declaration of usr_preferences table-->
-	<db_table id="usr_preferences">
-		<table_name>usr_preferences</table_name>
-		<db_url_id>mysql</db_url_id>
-		<column><field>id</field><type>DB_INT</type></column>
-		<column><field>uuid</field><type>DB_STR</type></column>
-		<column><field>username</field><type>DB_STR</type></column>
-		<column><field>domain</field><type>DB_STR</type></column>
-		<column><field>attribute</field><type>DB_STR</type></column>
-		<column><field>type</field><type>DB_INT</type></column>
-		<column><field>value</field><type>DB_STR</type></column>
-		<column><field>last_modified</field><type>DB_DATETIME</type></column>
-	</db_table>
 	<!-- Declaration of b2b_entities table-->
 	<db_table id="b2b_entities">
 		<table_name>b2b_entities</table_name>
@@ -986,6 +973,19 @@
 		<column><field>lname</field><type>DB_STR</type></column>
 		<column><field>description</field><type>DB_STR</type></column>
 	</db_table>
+	<!-- Declaration of usr_preferences table-->
+	<db_table id="usr_preferences">
+		<table_name>usr_preferences</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB_INT</type></column>
+		<column><field>uuid</field><type>DB_STR</type></column>
+		<column><field>username</field><type>DB_STR</type></column>
+		<column><field>domain</field><type>DB_STR</type></column>
+		<column><field>attribute</field><type>DB_STR</type></column>
+		<column><field>type</field><type>DB_INT</type></column>
+		<column><field>value</field><type>DB_STR</type></column>
+		<column><field>last_modified</field><type>DB_DATETIME</type></column>
+	</db_table>
 	<!-- Declaration of version table-->
 	<db_table id="version">
 		<table_name>version</table_name>
@@ -1492,59 +1492,6 @@
 			</clause_cols>
 		</cmd>
 	</mod>
-	<!-- usr_preferences provisionning -->
-	<mod><mod_name>usr_preferences</mod_name>
-		<cmd><cmd_name>show</cmd_name>
-			<db_table_id>usr_preferences</db_table_id>
-			<cmd_type>DB_QUERY</cmd_type>
-			<query_cols>
-				<col><field>id</field><link_cmd>update</link_cmd></col>
-				<col><field>uuid</field></col>
-				<col><field>username</field></col>
-				<col><field>domain</field></col>
-				<col><field>attribute</field></col>
-				<col><field>type</field></col>
-				<col><field>value</field></col>
-				<col><field>last_modified</field></col>
-			</query_cols>
-		</cmd>
-		<cmd><cmd_name>add</cmd_name>
-			<db_table_id>usr_preferences</db_table_id>
-			<cmd_type>DB_INSERT</cmd_type>
-			<query_cols>
-				<col><field>uuid</field></col>
-				<col><field>username</field></col>
-				<col><field>domain</field></col>
-				<col><field>attribute</field></col>
-				<col><field>type</field></col>
-				<col><field>value</field></col>
-				<col><field>last_modified</field></col>
-			</query_cols>
-		</cmd>
-		<cmd><cmd_name>update</cmd_name>
-			<db_table_id>usr_preferences</db_table_id>
-			<cmd_type>DB_UPDATE</cmd_type>
-			<clause_cols>
-				<col><field>id</field><operator>=</operator></col>
-			</clause_cols>
-			<query_cols>
-				<col><field>uuid</field></col>
-				<col><field>username</field></col>
-				<col><field>domain</field></col>
-				<col><field>attribute</field></col>
-				<col><field>type</field></col>
-				<col><field>value</field></col>
-				<col><field>last_modified</field></col>
-			</query_cols>
-		</cmd>
-		<cmd><cmd_name>delete</cmd_name>
-			<db_table_id>usr_preferences</db_table_id>
-			<cmd_type>DB_DELETE</cmd_type>
-			<clause_cols>
-				<col><field>id</field><operator>=</operator></col>
-			</clause_cols>
-		</cmd>
-	</mod>
 	<!-- b2b_entities provisionning -->
 	<mod><mod_name>b2b_entities</mod_name>
 		<cmd><cmd_name>show</cmd_name>
@@ -4882,6 +4829,59 @@
 			</clause_cols>
 		</cmd>
 	</mod>
+	<!-- usr_preferences provisionning -->
+	<mod><mod_name>usr_preferences</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>usr_preferences</db_table_id>
+			<cmd_type>DB_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
+				<col><field>uuid</field></col>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>attribute</field></col>
+				<col><field>type</field></col>
+				<col><field>value</field></col>
+				<col><field>last_modified</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>add</cmd_name>
+			<db_table_id>usr_preferences</db_table_id>
+			<cmd_type>DB_INSERT</cmd_type>
+			<query_cols>
+				<col><field>uuid</field></col>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>attribute</field></col>
+				<col><field>type</field></col>
+				<col><field>value</field></col>
+				<col><field>last_modified</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>usr_preferences</db_table_id>
+			<cmd_type>DB_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>uuid</field></col>
+				<col><field>username</field></col>
+				<col><field>domain</field></col>
+				<col><field>attribute</field></col>
+				<col><field>type</field></col>
+				<col><field>value</field></col>
+				<col><field>last_modified</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>usr_preferences</db_table_id>
+			<cmd_type>DB_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
+	</mod>
 	<!-- version provisionning -->
 	<mod><mod_name>version</mod_name>
 		<cmd><cmd_name>show</cmd_name>

diff --git a/scripts/pi_http/dbops-mod → scripts/pi_http/sqlops-mod b/scripts/pi_http/dbops-mod → scripts/pi_http/sqlops-mod
diff --git a/scripts/pi_http/dbops-table → scripts/pi_http/sqlops-table b/scripts/pi_http/dbops-table → scripts/pi_http/sqlops-table
diff --git a/scripts/postgres/dbops-create.sql → scripts/postgres/sqlops-create.sql b/scripts/postgres/dbops-create.sql → scripts/postgres/sqlops-create.sql
diff --git a/scripts/sqlite/dbops-create.sql → scripts/sqlite/sqlops-create.sql b/scripts/sqlite/dbops-create.sql → scripts/sqlite/sqlops-create.sql