[fix] rewrite trigger to meet sqlite trigger restrictions

[update] update sqlite_win.json
Azure · Mar 1, 2017 · 0995c47 · 0995c47
1 parent 961993d
commit 0995c47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/modules/sqlite/src/sqlite.c b/modules/sqlite/src/sqlite.c
@@ -362,13 +362,13 @@ static void sqlite_try_update_trigger(SQLITE_HANDLE_DATA * handleData, SQLITE_SO
     }
     sql_primary[strlen(sql_primary)-1] = '\0'; // remove last comma
 
-    SNPRINTF_S(sql_drop_trigger, BUFSIZE - 1, "DROP TRIGGER %s_size_control;", src_table->table);
-    SNPRINTF_S(sql_trigger, BUFSIZE - 1, "CREATE TRIGGER %s_size_control INSERT ON %s WHEN (select count(*) from %s)>%d\n"
-        "BEGIN\n"
-        "DELETE FROM %s WHERE (%s) IN (SELECT %s FROM %s ORDER BY DATETIME limit (select count(*) - %d from %s));\n"
-        "END;",
+	SNPRINTF_S(sql_drop_trigger, BUFSIZE - 1, "DROP TRIGGER %s_size_control;", src_table->table);
+	SNPRINTF_S(sql_trigger, BUFSIZE - 1, "CREATE TRIGGER %s_size_control INSERT ON %s WHEN (SELECT count(*) from %s)>%d\n"
+		"BEGIN\n"
+		"DELETE FROM %s WHERE rowid <= (SELECT max(rowid) - %d FROM %s);\n"
+		"END;",
         src_table->table, src_table->table, src_table->table, src_table->limit,
-        src_table->table, sql_primary, sql_primary, src_table->table, src_table->limit, src_table->table
+        src_table->table, src_table->limit, src_table->table
         );
     sqlite_exec(handleData, sql_drop_trigger, 0);
     sqlite_exec(handleData, sql_trigger, 0);

diff --git a/samples/sqlite_sample/src/sqlite_win.json b/samples/sqlite_sample/src/sqlite_win.json
@@ -5,7 +5,7 @@
       "loader": {
         "name": "native",
         "entrypoint": {
-          "module.path": "D:\\code\\azure-iot-gateway-sdk_1216\\build\\modules\\iothub\\Debug\\iothub.dll"
+          "module.path": "..\\..\\..\\modules\\iothub\\Debug\\iothub.dll"
         }
       },
       "args": {
@@ -19,7 +19,7 @@
       "loader": {
         "name": "native",
         "entrypoint": {
-          "module.path": "D:\\code\\azure-iot-gateway-sdk_1216\\build\\modules\\identitymap\\Debug\\identity_map.dll"
+          "module.path": "..\\..\\..\\modules\\identitymap\\Debug\\identity_map.dll"
         }
       },
       "args": [
@@ -35,7 +35,7 @@
       "loader": {
         "name": "native",
         "entrypoint": {
-          "module.path": "D:\\code\\azure-iot-gateway-sdk_0113\\build\\modules\\sqlite\\Debug\\sqlite.dll"
+          "module.path": "..\\..\\..\\modules\\sqlite\\Debug\\sqlite.dll"
         }
       },
       "args": {
@@ -81,7 +81,7 @@
       "loader": {
         "name": "native",
         "entrypoint": {
-          "module.path": "D:\\code\\azure-iot-gateway-sdk_0113\\build\\modules\\modbus_read\\Debug\\modbus_read.dll"
+          "module.path": "..\\..\\..\\modules\\modbus_read\\Debug\\modbus_read.dll"
         }
       },
       "args": [