Merge branch 'main' into integration-tests-import-local-python-libs

Author: Bill-hbrhbr

components/package-template/src/sbin/.common-env.sh

@@ -31,22 +31,28 @@ CLP_PWD_HOST="$(pwd 2>/dev/null || echo "")"
 export CLP_PWD_HOST
 
 if [[ -z "${CLP_DOCKER_PLUGIN_DIR:-}" ]]; then
-    for compose_plugin_dir in \
-        "$HOME/.docker/cli-plugins" \
-        "/mnt/wsl/docker-desktop/cli-tools/usr/local/lib/docker/cli-plugins" \
-        "/usr/local/lib/docker/cli-plugins" \
-        "/usr/libexec/docker/cli-plugins"; do
-
-        compose_plugin_path="$compose_plugin_dir/docker-compose"
-        if [[ -f "$compose_plugin_path" ]]; then
-            export CLP_DOCKER_PLUGIN_DIR="$compose_plugin_dir"
-            break
-        fi
-    done
-    if [[ -z "${CLP_DOCKER_PLUGIN_DIR:-}" ]]; then
-        echo >&2 "Warning: Docker plugin directory not found;" \
-            "Docker Compose may not work inside container."
+    compose_plugin_path="$(docker info \
+        --format '{{range .ClientInfo.Plugins}}{{if eq .Name "compose"}}{{.Path}}{{end}}{{end}}' \
+        2>/dev/null)"
+
+    if [[ -z "$compose_plugin_path" || ! -f "$compose_plugin_path" ]]; then
+        echo >&2 "Error: Docker Compose plugin not found via 'docker info'."
+        return 1
+    fi
+
+    resolved_plugin_path="$(readlink -f "$compose_plugin_path" 2>/dev/null || true)"
+    if [[ -z "$resolved_plugin_path" ]]; then
+        echo >&2 "Error: Failed to resolve Docker Compose plugin's real path."
+        return 1
     fi
+
+    plugin_dir="$(dirname "$resolved_plugin_path")"
+    if [[ -z "$plugin_dir" || "$plugin_dir" == "." || ! -d "$plugin_dir" ]]; then
+        echo >&2 "Error: Failed to resolve Docker Compose plugin directory."
+        return 1
+    fi
+
+    export CLP_DOCKER_PLUGIN_DIR="$plugin_dir"
 fi
 
 if [[ -z "${CLP_DOCKER_SOCK_PATH:-}" ]]; then

components/webui/client/src/sql-parser/Sql.g4

@@ -1,3 +1,23 @@
 grammar Sql;
 
 import SqlBase;
+
+selectItemList
+    : selectItem (',' selectItem)*
+    ;
+
+standaloneSelectItemList
+    : selectItemList EOF
+    ;
+
+standaloneBooleanExpression
+    : booleanExpression EOF
+    ;
+
+sortItemList
+    : sortItem (',' sortItem)*
+    ;
+
+standaloneSortItemList
+    : sortItemList EOF
+    ;

components/webui/client/src/sql-parser/generated/SqlLexer.ts

@@ -273,9 +273,9 @@ export default class SqlLexer extends Lexer {
 	public static readonly EOF = Token.EOF;
 
 	public static readonly channelNames: string[] = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ];
-	public static readonly literalNames: (string | null)[] = [ null, "'.'", 
-                                                            "'('", "')'", 
-                                                            "','", "'?'", 
+	public static readonly literalNames: (string | null)[] = [ null, "','", 
+                                                            "'.'", "'('", 
+                                                            "')'", "'?'", 
                                                             "'->'", "'['", 
                                                             "']'", "'=>'", 
                                                             "'ADD'", "'ADMIN'", 
@@ -988,8 +988,8 @@ export default class SqlLexer extends Lexer {
 	491,2212,1,0,0,0,493,2216,1,0,0,0,495,2226,1,0,0,0,497,2234,1,0,0,0,499,
 	2245,1,0,0,0,501,2256,1,0,0,0,503,2279,1,0,0,0,505,2307,1,0,0,0,507,2325,
 	1,0,0,0,509,2334,1,0,0,0,511,2336,1,0,0,0,513,2338,1,0,0,0,515,2355,1,0,
-	0,0,517,2370,1,0,0,0,519,2376,1,0,0,0,521,522,5,46,0,0,522,2,1,0,0,0,523,
-	524,5,40,0,0,524,4,1,0,0,0,525,526,5,41,0,0,526,6,1,0,0,0,527,528,5,44,
+	0,0,517,2370,1,0,0,0,519,2376,1,0,0,0,521,522,5,44,0,0,522,2,1,0,0,0,523,
+	524,5,46,0,0,524,4,1,0,0,0,525,526,5,40,0,0,526,6,1,0,0,0,527,528,5,41,
 	0,0,528,8,1,0,0,0,529,530,5,63,0,0,530,10,1,0,0,0,531,532,5,45,0,0,532,
 	533,5,62,0,0,533,12,1,0,0,0,534,535,5,91,0,0,535,14,1,0,0,0,536,537,5,93,
 	0,0,537,16,1,0,0,0,538,539,5,61,0,0,539,540,5,62,0,0,540,18,1,0,0,0,541,