Merge branch '1.19' of ssh://gitlab.anubis-lang.com:33000/totoro/hayamiki_lib into 1.19

David RENÉ
2 parents be9ff1bd f929f8f4
Showing 1 changed file with 82 additions and 7 deletions Show diff stats
controller/hk_sql_utils.anubis
@@ -82,6 +82,29 @@ public define Int
   }
 .
  
+public define Int
+  db_get_Int
+  (
+    SQLite3DataBase   db,
+    String            clause,
+    List(SQLite3Bind) binds
+  )=
+  if sql_query_timeout(db, clause+";", binds, "db_get_Int") is
+  {
+    error(sql_error) then println("db_get_Int SQL ERROR '"+ sql_error.text + "'\n clause ["+clause+";]");0,
+    ok(_, cursor, _) then db_get_Int(cursor)
+  }
+.
+
+public define Int
+  db_get_Int
+  (
+    SQLite3DataBase   db,
+    String            clause
+  )=
+  db_get_Int(db, clause, [])
+.
+
 public define Float
   get_count_float_by_full_clause
   (
@@ -95,6 +118,29 @@ public define Float
   }
 .
  
+public define Float
+  db_get_Float
+  (
+    SQLite3DataBase   db,
+    String            clause,
+    List(SQLite3Bind) binds
+  )=
+  if sql_query_timeout(db, clause+";", binds, "db_get_Float") is
+  {
+    error(sql_error) then println("db_get_Float SQL ERROR '"+ sql_error.text + "'\n clause ["+clause+";]");0.0,
+    ok(_, cursor, _) then db_get_Float(cursor)
+  }
+.
+
+public define Float
+  db_get_Float
+  (
+    SQLite3DataBase   db,
+    String            clause
+  )=
+  db_get_Float(db, clause, [])
+.
+
 public define Int
   get_count_by_clause
   (
@@ -209,16 +255,28 @@ public define List(DB_id)
     SQLite3DataBase db,
     String          table_name,
     String          id_col,
-    String          full_clause
+    String          full_clause,
+    List(SQLite3Bind) binds
   )=
  
-  if sql_query_timeout(db, "SELECT \""+id_col+"\" FROM "+table_name+" "+full_clause+";", [], "get_db_ids_by_full_clause") is
+  if sql_query_timeout(db, "SELECT \""+id_col+"\" FROM "+table_name+" "+full_clause+";", binds, "get_db_ids_by_full_clause") is
   {
     error(sql_error) then println("get_db_ids_by_full_clause SQL ERROR '"+ sql_error.text + "'\n table_name ["+table_name+"]\n id_col["+id_col+"]\nfull_clause ["+full_clause+";]");[],
     ok(_, cursor, _) then db_get_List_DB_id(cursor)
   }
 .
  
+public define List(DB_id)
+  get_db_ids_by_full_clause
+  (
+    SQLite3DataBase db,
+    String          table_name,
+    String          id_col,
+    String          full_clause
+  )=
+  get_db_ids_by_full_clause(db, table_name, id_col, full_clause, [])
+.
+
 public define Maybe(Int)
   get_mb_id_by_clause
   (
@@ -381,14 +439,28 @@ public define List($T)
   (
     SQLite3DataBase db,
     String          table_name,
-    String          id_col,
     String          full_clause,
     (One -> SQLite3Row table_cursor) -> Maybe($T)       extractor
   )=
  
   if sql_query_timeout(db, "SELECT * FROM "+table_name+" "+full_clause+";", [], "get_all_by_full_clause") is
   {
-    error(sql_error) then println("get_db_ids_by_full_clause SQL ERROR '"+ sql_error.text + "'\n table_name ["+table_name+"]\n id_col["+id_col+"]\nfull_clause ["+full_clause+";]");[],
+    error(sql_error) then println("get_all_by_full_clause SQL ERROR '"+ sql_error.text + "'\n table_name ["+table_name+"]\n full_clause ["+full_clause+";]");[],
+    ok(_, cursor, _) then _get_all(extractor)(cursor, [])
+  }
+.
+
+public define List($T)
+  get_all_by_full_clause
+  (
+    SQLite3DataBase db,
+    String          full_clause,
+    (One -> SQLite3Row table_cursor) -> Maybe($T)       extractor
+  )=
+  
+  if sql_query_timeout(db, full_clause+";", [], "get_all_by_full_clause") is
+  {
+    error(sql_error) then println("get_all_by_full_clause SQL ERROR '"+ sql_error.text + "'\n full_clause ["+full_clause+";]");[],
     ok(_, cursor, _) then _get_all(extractor)(cursor, [])
   }
 .
@@ -601,10 +673,11 @@ public define Maybe(Int)
   {
     none then
       since make_insert_clause_and_binds(fields) is (binds, insert_columns, insert_values),
-      if sql_query_timeout(db, "INSERT INTO "+table_name+" "+insert_columns+" VALUES "+insert_values+";", binds, table_name+" (INSERT)") is
+      with insert_query = "INSERT INTO "+table_name+" "+insert_columns+" VALUES "+insert_values+";",
+      if sql_query_timeout(db, insert_query, binds, table_name+" (INSERT)") is
       {
         error(sql_error)  then 
-          //logError(debug_log, db_error(sql_error, table_name));
+          println("insert on table '"+table_name+"' SQL ERROR '"+ sql_error.text + "'\n sql_insert ["+insert_query+"]\n binds "+dump_Binds(binds));
           failure,
         ok(_, cursor, _)  then 
           if sql_query_scalar(db, "SELECT last_insert_rowid()") is
@@ -622,9 +695,11 @@ public define Maybe(Int)
       },
     db_id(idx) then
       since make_update_clause_and_binds(fields) is (binds, set_string),
-      if sql_query_timeout(db, "UPDATE "+table_name+" SET "+set_string +" WHERE id = "+idx+";", binds, table_name+" (UPDATE)") is
+      with update_query = "UPDATE "+table_name+" SET "+set_string +" WHERE id = "+idx+";",
+      if sql_query_timeout(db, update_query, binds, table_name+" (UPDATE)") is
       {
         error(sql_error) then 
+          println("update on table '"+table_name+"' id ["+idx+"] SQL ERROR '"+ sql_error.text + "'\n sql_insert ["+update_query+"]\n binds "+dump_Binds(binds));
           //logError(debug_log, db_error(sql_error, table_name));
           failure,
         ok(_, _, _)      then success(idx)