Module: kamailio
Branch: master
Commit: d0372a132767cf08dd8786692fe56922bbceece2
URL:
https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692…
Author: lazedo <luis.azedo(a)factorlusitano.com>
Committer: lazedo <luis.azedo(a)factorlusitano.com>
Date: 2016-01-04T10:18:08Z
Merge pull request #459 from kamailio/lazedo/db_text_replace
db_text: add support for replace
---
Modified: modules/db_text/dbt_base.c
Modified: modules/db_text/dbtext.c
Modified: modules/db_text/dbtext.h
---
Diff:
https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692…
Patch:
https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe5692…
---
diff --git a/modules/db_text/dbt_base.c b/modules/db_text/dbt_base.c
index 6d70ce5..4ab9a16 100644
--- a/modules/db_text/dbt_base.c
+++ b/modules/db_text/dbt_base.c
@@ -617,3 +617,132 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t*
_v,
return -1;
}
+int dbt_replace(db1_con_t* _h, db_key_t* _k, db_val_t* _v,
+ int _n, int _nk, int _m)
+{
+ dbt_table_p _tbc = NULL;
+ dbt_row_p _drp = NULL;
+ int i, j;
+ int *lkey=NULL, *lres=NULL;
+
+ if (!_h || !CON_TABLE(_h) || _nk <= 0)
+ {
+ LM_ERR("invalid parameters\n");
+ return -1;
+ }
+
+ ((dbt_con_p)_h->tail)->affected = 0;
+
+ /* lock database */
+ _tbc = dbt_db_get_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h));
+ if(!_tbc)
+ {
+ LM_ERR("table %.*s does not exist!\n", CON_TABLE(_h)->len,
CON_TABLE(_h)->s);
+ return -1;
+ }
+
+ if(_k)
+ {
+ lkey = dbt_get_refs(_tbc, _k, _nk);
+ if(!lkey)
+ goto error;
+ }
+ lres = dbt_get_refs(_tbc, _k, _n);
+ if(!lres)
+ goto error;
+ _drp = _tbc->rows;
+ while(_drp)
+ {
+ if(dbt_row_match(_tbc, _drp, lkey, NULL, _v, _nk))
+ { // update fields
+ for(i=0; i<_n; i++)
+ {
+ if(dbt_is_neq_type(_tbc->colv[lres[i]]->type, _v[i].type))
+ {
+ LM_ERR("incompatible types!\n");
+ goto error;
+ }
+
+ if(dbt_row_update_val(_drp, &(_v[i]),
+ _tbc->colv[lres[i]]->type, lres[i]))
+ {
+ LM_ERR("cannot set v[%d] in c[%d]!\n",
+ i, lres[i]);
+ goto error;
+ }
+ }
+
+ ((dbt_con_p)_h->tail)->affected++;
+
+ }
+ _drp = _drp->next;
+ }
+
+ if(((dbt_con_p)_h->tail)->affected == 0) {
+ _drp = dbt_row_new(_tbc->nrcols);
+ if(!_drp)
+ {
+ LM_ERR("no shm memory for a new row!!\n");
+ goto error;
+ }
+
+ for(i=0; i<_n; i++)
+ {
+ j = lres[i];
+ if(dbt_is_neq_type(_tbc->colv[j]->type, _v[i].type))
+ {
+ LM_ERR("incompatible types v[%d] - c[%d]!\n", i, j);
+ goto error;
+ }
+ if(_v[i].type == DB1_STRING && !_v[i].nul)
+ _v[i].val.str_val.len = strlen(_v[i].val.string_val);
+ if(dbt_row_set_val(_drp, &(_v[i]), _tbc->colv[j]->type, j))
+ {
+ LM_ERR("cannot set v[%d] in c[%d]!\n", i, j);
+ goto error;
+ }
+ }
+
+ if(dbt_table_add_row(_tbc, _drp))
+ {
+ LM_ERR("cannot insert the new row!!\n");
+ goto error;
+ }
+
+ ((dbt_con_p)_h->tail)->affected = 1;
+
+ }
+
+ if( ((dbt_con_p)_h->tail)->affected )
+ dbt_table_update_flags(_tbc, DBT_TBFL_MODI, DBT_FL_SET, 1);
+
+ /* dbt_print_table(_tbc, NULL); */
+
+ /* unlock database */
+ dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h));
+
+ if(lkey)
+ pkg_free(lkey);
+ if(lres)
+ pkg_free(lres);
+
+ return 0;
+
+error:
+
+ if(lkey)
+ pkg_free(lkey);
+ if(lres)
+ pkg_free(lres);
+ if(_drp) // free row
+ dbt_row_free(_tbc, _drp);
+
+ /* unlock database */
+ dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h));
+
+ LM_ERR("failed to update the table!\n");
+
+ return -1;
+}
+
+
diff --git a/modules/db_text/dbtext.c b/modules/db_text/dbtext.c
index 4f1d4a6..f601398 100644
--- a/modules/db_text/dbtext.c
+++ b/modules/db_text/dbtext.c
@@ -125,9 +125,10 @@ int dbt_bind_api(db_func_t *dbb)
dbb->insert = (db_insert_f)dbt_insert;
dbb->delete = (db_delete_f)dbt_delete;
dbb->update = (db_update_f)dbt_update;
+ dbb->replace = (db_replace_f)dbt_replace;
dbb->affected_rows = (db_affected_rows_f) dbt_affected_rows;
dbb->raw_query = (db_raw_query_f) dbt_raw_query;
- dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY;
+ dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY |
DB_CAP_REPLACE;
return 0;
}
diff --git a/modules/db_text/dbtext.h b/modules/db_text/dbtext.h
index 92e6236..5cbacae 100644
--- a/modules/db_text/dbtext.h
+++ b/modules/db_text/dbtext.h
@@ -82,6 +82,12 @@ int dbt_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v,
db_key_t* _uk, db_val_t* _uv, int _n, int _un);
/*
+ * replace a row in table
+ */
+int dbt_replace(db1_con_t* _h, db_key_t* _k, db_val_t* _v,
+ int _n, int _nk, int _m);
+
+/*
* Affected rows
*/
int dbt_affected_rows(db1_con_t* _h);