diff --git a/src/generation/types.anubis b/src/generation/types.anubis
index f710341..172c39b 100644
--- a/src/generation/types.anubis
+++ b/src/generation/types.anubis
@@ -303,7 +303,7 @@ public define Maybe(One)
      "    none then\n"+
      "      if sql_query_timeout(db,\n"+
      "             \"INSERT INTO "+name+"\n"+
-     insert_values(columns, "             ")+";\",\n"+
+     insert_values(columns, false, "             ")+";\",\n"+
      generate_Bind_list(columns, name, "             ", true)+",\n"+
      "             \"update_"+name+" (INSERT)\") is\n"+
      "      {\n"+
@@ -322,9 +322,12 @@ public define Maybe(One)
      //UPDATE SQL query
      "    db_id(idx) then\n"+
      "      if sql_query_timeout(db,\n"+
-     "             \"UPDATE "+name+" SET\n"+
+     "             \"INSERT INTO "+name+"\n"+
+     insert_values(columns, true, "             ")+"\n"+
+     "             ON CONFLICT( \\\"id\\\") DO UPDATE SET\n"+
      update_values(columns, "             ")+"\n"+
-     "             WHERE id = \"+idx+\";\",\n"+
+     "             WHERE id = :v_id;\",\n"+
+     "             [bind_Int(\":v_id\", idx)]+\n"+
      generate_Bind_list(columns, name, "             ", false)+",\n"+
      "             \"update_"+name+" (UPDATE)\") is { \n"+
      "                 error(sql_error) then\n"+
--
libgit2 0.21.4