From 12ed34cc1e5545c01fe2ad12c5a64059493448a5 Mon Sep 17 00:00:00 2001
From: MartinChoo <214582617@qq.com>
Date: Wed, 9 Apr 2025 19:14:53 +0800
Subject: [PATCH] Sync and revert 5.1 features

Signed-off-by: MartinChoo <214582617@qq.com>
---
 BUILD.gn         | 2 +-
 bundle.json      | 3 ---
 src/sqlite3.c    | 2 +-
 src/sqlite3icu.c | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 84e3673..92b9baf 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -125,7 +125,7 @@ ohos_shared_library("sqlite") {
   }
   deps = []
   public_configs = [ ":sqlite_config" ]
-  public_external_deps = [ "c_utils:utils" ]
+  public_external_deps = [ "c_utils:utilsbase" ]
   configs = [ ":sqlite3_private_config" ]
   innerapi_tags = [ "platformsdk_indirect" ]
   part_name = "sqlite"
diff --git a/bundle.json b/bundle.json
index 2d7932d..8af2129 100644
--- a/bundle.json
+++ b/bundle.json
@@ -23,9 +23,6 @@
                 "c_utils",
                 "icu",
                 "openssl"
-            ],
-            "third_party": [
-                "openssl"
             ]
         },
         "build": {
diff --git a/src/sqlite3.c b/src/sqlite3.c
index 4a6e09e..24c6b8c 100644
--- a/src/sqlite3.c
+++ b/src/sqlite3.c
@@ -105432,7 +105432,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       sqlite3WalkExprList(pWalker, pList);
       if( is_agg ){
 #ifndef SQLITE_OMIT_WINDOWFUNC
-        if( pWin && pParse->nErr==0 ){
+        if( pWin ){
           Select *pSel = pNC->pWinSelect;
           assert( pWin==0 || (ExprUseYWin(pExpr) && pWin==pExpr->y.pWin) );
           if( IN_RENAME_OBJECT==0 ){
diff --git a/src/sqlite3icu.c b/src/sqlite3icu.c
index 8495098..c72adac 100644
--- a/src/sqlite3icu.c
+++ b/src/sqlite3icu.c
@@ -590,8 +590,8 @@ EXPORT_SYMBOLS SQLITE_API int sqlite3IcuInit(sqlite3 *db){
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_ICU) */
   };
 #ifdef HARMONY_OS
-  const char *directory = "/system/usr/ohos_icu";
-  u_setDataDirectory(directory);
+  extern void SetOhosIcuDirectory();
+  SetOhosIcuDirectory();
 #endif
   int rc = SQLITE_OK;
   int i;
-- 
Gitee