Simplify the ENSO_SQL_LOG_PATH to just log the SQL.

Use ENSO_PROFILE_SQL to get timing now.

Author: jdunkerley

distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso

@@ -2,8 +2,11 @@ from Standard.Base import all
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Errors.Unimplemented.Unimplemented
+import Standard.Base.Logging.Log_Level
+import Standard.Base.Logging.Profile
 import Standard.Base.Runtime.Context
 import Standard.Base.Runtime.Managed_Resource.Managed_Resource
+import Standard.Base.Runtime.State
 from Standard.Base.Enso_Cloud.Enso_Secret import as_hideable_value
 
 from Standard.Table import Table, Value_Type
@@ -256,27 +259,26 @@ private _set_statement_values stmt:PreparedStatement statement_setter:Statement_
    A helper that logs performed SQL queries/statements run-time to a profiling
    file, if an environment variable is set.
 private _profile_sql_if_enabled (jdbc_connection : JDBC_Connection) (~query_text : Text) ~action (skip_log:Boolean=False) =
-    path = if skip_log then "" else
-        Environment.get "ENSO_SQL_PROFILING_PATH" . if_nothing Environment.get "ENSO_SQL_LOG_PATH" . if_nothing ""
-    if path.is_empty then action else
-        duration_and_result = Duration.time_execution action
-        result = duration_and_result.second
-        ## If the action returns a dataflow error, `time_execution` returns the error, no duration.
-           We could work around this. But we don't want to - the failing queries likely did not run anyway,
-           so their time info would most likely be an outlier. For current purposes it makes sense to ignore such cases.
-        Error.return_if_error result
-
-        padded_query = query_text.to_display_text.pad length=80
-        millis = duration_and_result.first.total_milliseconds
-        millis_text = (millis.to_text.pad length=5 with_pad=' ' at=..Left) + ' ms'
-
-        # E.g. [SQLite] SELECT * FROM "test" ... --> 12 ms
+    make_label =
         db_id = jdbc_connection.with_metadata .getDatabaseProductName
-        log_line = "[" + db_id + "] " + padded_query + " --> " + millis_text + '\n'
-        Context.Output.with_enabled <|
-            log_line.write path on_existing_file=Existing_File_Behavior.Append
+        "[" + db_id + "] " + query_text.to_display_text
 
-        result
+    Profile.time_execution _profile_level label=make_label module=JDBC_Connection <|
+        path = if skip_log then "" else Environment.get "ENSO_SQL_LOG_PATH" . if_nothing ""
+        if path.is_empty then @Tail_Call action else
+            result = action
+            ## If the action returns a dataflow error, `time_execution` returns the error, no duration.
+               We could work around this. But we don't want to - the failing queries likely did not run anyway,
+               so their time info would most likely be an outlier. For current purposes it makes sense to ignore such cases.
+            Error.return_if_error result
+
+            # E.g. [SQLite] SELECT * FROM "test"
+            padded_query = make_label.pad 100
+            log_line = "[" + Date_Time.now.to_text + "] [" + db_id + "] " + padded_query '\n'
+            Context.Output.with_enabled <|
+                log_line.write path on_existing_file=Existing_File_Behavior.Append
+
+            result
 
 ## ---
    private: true
@@ -285,3 +287,11 @@ private _profile_sql_if_enabled (jdbc_connection : JDBC_Connection) (~query_text
    this Connection concurrently.
 private _synchronized (jdbc_connection : JDBC_Connection) ~action =
     jdbc_connection.operation_synchronizer.runSynchronizedAction _->action
+
+private _profile_level = State.get Table if_missing=_profile_level_from_env
+
+private _profile_level_from_env =
+    env_val = Environment.get "ENSO_PROFILE_SQL"
+    if env_val == Nothing then Nothing else
+        level = Log_Level.from env_val
+        if level.is_error then Nothing else level

distribution/lib/Standard/Table/0.0.0-dev/src/Table.enso

@@ -11,9 +11,10 @@ import Standard.Base.Errors.Common.Type_Error
 import Standard.Base.Errors.File_Error.File_Error
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Errors.Unimplemented.Unimplemented
+import Standard.Base.Logging.Log_Level
+import Standard.Base.Logging.Profile
 import Standard.Base.Runtime.State
 import Standard.Base.System.File.Generic.Writable_File.Writable_File
-from Standard.Base.Logging import Profile
 from Standard.Base.Metadata import Display, make_single_choice, Widget
 from Standard.Base.Metadata.Choice import Option
 from Standard.Base.Widget_Helpers import make_any_selector, make_data_cleanse_vector_selector, make_delimiter_selector