Merge pull request #314 from taosdata/merge/3.0tomain_250324

merge: from 3.0 to main for decimal data type

Author: sheyanjie-qq

.github/workflows/build.yml

@@ -74,7 +74,7 @@ jobs:
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: 'main'
+          if_true: '3.3.6'
           if_false: '3.0'
 
       - name: Checkout tdengine

.github/workflows/mac.yml

@@ -22,17 +22,27 @@ jobs:
     outputs:
       commit_id: ${{ steps.get_commit_id.outputs.commit_id }}
     steps:
+      #----------------------------------------------
+      # Determine TDengine branch dynamically
+      #----------------------------------------------
+      - name: Determine TDengine branch
+        uses: haya14busa/action-cond@v1
+        id: determine-branch
+        with:
+          cond: ${{ github.base_ref == 'main' }}
+          if_true: '3.3.6'
+          if_false: '3.0'
+
+      #----------------------------------------------
+      # Checkout TDengine repository
+      #----------------------------------------------
       - name: Checkout TDengine
-        if: |
-          github.event_name == 'pull_request'
-          || github.event_name == 'push'
-          || github.event_name == 'schedule'
         uses: actions/checkout@v4
         with:
-          repository: 'taosdata/TDengine'
-          path: 'TDengine'
-          ref: ${{ github.event.pull_request.base.ref }}
-  
+          repository: "taosdata/TDengine"
+          path: "TDengine"
+          ref: ${{ steps.determine-branch.outputs.value }}
+
       - name: get_commit_id
         id: get_commit_id
         run: |
@@ -274,7 +284,6 @@ jobs:
 
       - name: prepare install
         run: |
-          brew install geos
           sudo mkdir -p /usr/local/lib
           sudo mkdir -p /usr/local/include
 
@@ -353,6 +362,8 @@ jobs:
       # run test suite
       #----------------------------------------------
       - name: Test
+        env:
+          DYLD_LIBRARY_PATH: /usr/local/lib:$DYLD_LIBRARY_PATH
         run: |
           source $VENV
           export TDENGINE_URL=localhost:6041

.github/workflows/taos-ws-py.yml

@@ -162,7 +162,7 @@ jobs:
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: 'main'
+          if_true: '3.3.6'
           if_false: '3.0'
 
       - name: Checkout tdengine

.github/workflows/test-td-case.yml

@@ -79,7 +79,7 @@ jobs:
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: 'main'
+          if_true: '3.3.6'
           if_false: '3.0'
 
       - name: Checkout tdengine

.github/workflows/test-ubuntu-2004.yml

@@ -77,7 +77,7 @@ jobs:
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: 'main'
+          if_true: '3.3.6'
           if_false: '3.0'
 
       - name: Checkout tdengine

tests/test_cinterface.py

@@ -563,6 +563,7 @@ def test_taos_stmt2_get_fields():
 
     # check
     check_fields = [
+        TaosFieldAllCls("tbname", 8, 0, 0, 271, 4),          
         TaosFieldAllCls("grade", 8, 0, 0, 26, 2),          
         TaosFieldAllCls("class", 4, 0, 0, 4, 2),          
         TaosFieldAllCls("ts",    9, 0, 0, 8, 1),          
@@ -571,7 +572,8 @@ def test_taos_stmt2_get_fields():
         TaosFieldAllCls("score", 4, 0, 0, 4, 1)
     ]
     count, fields = taos_stmt2_get_fields(stmt2)
-    assert count == cnt_tags + cnt_cols
+    print("count: %d, fields: %s" % (count, fields))
+    assert count == cnt_tags + cnt_cols + 1
     assert len(fields) == count
     for i in range(count):
         assert fields[i].name == check_fields[i].name