Renamed PG changes functions and removed unused variable

Author: marcobambini

src/pk.c

@@ -195,7 +195,6 @@ double pk_decode_double (char *buffer, size_t *bseek) {
 }
 
 int pk_decode(char *buffer, size_t blen, int count, size_t *seek, int skip_decode_idx, int (*cb) (void *xdata, int index, int type, int64_t ival, double dval, char *pval), void *xdata) {
-    cloudsync_pk_decode_bind_context *decode_context = (cloudsync_pk_decode_bind_context*)xdata;
     size_t bseek = (seek) ? *seek : 0;
     if (count == -1) count = pk_decode_u8(buffer, &bseek);
 

src/postgresql/cloudsync--1.0.sql

@@ -222,7 +222,7 @@ AS 'MODULE_PATHNAME', 'cloudsync_col_value_encoded'
 LANGUAGE C STABLE;
 
 -- SetReturningFunction: To implement SELECT FROM cloudsync_changes
-CREATE FUNCTION cloudsync_changes_srf(
+CREATE FUNCTION cloudsync_changes_select(
   min_db_version bigint DEFAULT 0,
   filter_site_id bytea DEFAULT NULL
 )
@@ -237,20 +237,20 @@ RETURNS TABLE (
     cl bigint,
     seq bigint
 )
-AS 'MODULE_PATHNAME', 'cloudsync_changes_srf'
+AS 'MODULE_PATHNAME', 'cloudsync_changes_select'
 LANGUAGE C STABLE;
 
 -- View con lo stesso nome della vtab SQLite
 CREATE OR REPLACE VIEW cloudsync_changes AS
-SELECT * FROM cloudsync_changes_srf(0, NULL);
+SELECT * FROM cloudsync_changes_select(0, NULL);
 
 -- Trigger function to implement INSERT on the cloudsync_changes view
-CREATE FUNCTION cloudsync_changes_insert_trg()
+CREATE FUNCTION cloudsync_changes_insert_trigger()
 RETURNS trigger
-AS 'MODULE_PATHNAME', 'cloudsync_changes_insert_trg'
+AS 'MODULE_PATHNAME', 'cloudsync_changes_insert_trigger'
 LANGUAGE C;
 
 CREATE OR REPLACE TRIGGER cloudsync_changes_insert
 INSTEAD OF INSERT ON cloudsync_changes
 FOR EACH ROW
-EXECUTE FUNCTION cloudsync_changes_insert_trg();
+EXECUTE FUNCTION cloudsync_changes_insert_trigger();

src/postgresql/cloudsync_postgresql.c

@@ -2032,8 +2032,8 @@ static Oid lookup_column_type_oid (const char *tbl, const char *col_name) {
     return typoid;
 }
 
-PG_FUNCTION_INFO_V1(cloudsync_changes_srf);
-Datum cloudsync_changes_srf(PG_FUNCTION_ARGS) {
+PG_FUNCTION_INFO_V1(cloudsync_changes_select);
+Datum cloudsync_changes_select(PG_FUNCTION_ARGS) {
     FuncCallContext *funcctx;
     SRFState *st_local = NULL;
     bool spi_connected_local = false;
@@ -2148,12 +2148,12 @@ Datum cloudsync_changes_srf(PG_FUNCTION_ARGS) {
 
 // Trigger INSERT
 
-PG_FUNCTION_INFO_V1(cloudsync_changes_insert_trg);
-Datum cloudsync_changes_insert_trg (PG_FUNCTION_ARGS) {
+PG_FUNCTION_INFO_V1(cloudsync_changes_insert_trigger);
+Datum cloudsync_changes_insert_trigger (PG_FUNCTION_ARGS) {
     // sanity check
     bool spi_connected = false;
     TriggerData *trigdata = (TriggerData *) fcinfo->context;
-    if (!CALLED_AS_TRIGGER(fcinfo)) ereport(ERROR, (errmsg("cloudsync_changes_insert_trg must be called as trigger")));
+    if (!CALLED_AS_TRIGGER(fcinfo)) ereport(ERROR, (errmsg("cloudsync_changes_insert_trigger must be called as trigger")));
     if (!TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) ereport(ERROR, (errmsg("Only INSERT allowed on cloudsync_changes")));
 
     HeapTuple newtup = trigdata->tg_trigtuple;
@@ -2212,7 +2212,9 @@ Datum cloudsync_changes_insert_trg (PG_FUNCTION_ARGS) {
         } else {
             rc = merge_insert (data, table, VARDATA_ANY(insert_pk), insert_pk_len, insert_cl, insert_name, col_value, insert_col_version, insert_db_version, VARDATA_ANY(insert_site_id), insert_site_id_len, insert_seq, &rowid);
         }
-        if (rc != DBRES_OK) ereport(ERROR, (errmsg(database_errmsg(data))));
+        if (rc != DBRES_OK) {
+            ereport(ERROR, (errmsg("Eroor during merge_insert: %s", database_errmsg(data))));
+        }
 
         SPI_finish();
         spi_connected = false;