proper fix + ci updates

igorcoding · May 5, 2024 · d94744b · d94744b
1 parent 81bd382
commit d94744b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -8,10 +8,12 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.10']
-        tarantool: ['1.10', '2']
+        tarantool: ['1.10', '2', '3']
         exclude:
           - os: macos-latest
             tarantool: '1.10'
+          - os: macos-latest
+            tarantool: '2'
           - os: macos-latest
             python-version: '3.7'
           - python-version: 'pypy3.10'
@@ -20,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Tarantool ${{ matrix.tarantool }}
@@ -64,11 +66,11 @@ jobs:
       - test
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
         run: python -m pip install --upgrade cibuildwheel
@@ -94,19 +96,19 @@ jobs:
         id: get_tag
         run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//}
       - run: echo "Current tag is ${{ steps.get_tag.outputs.TAG }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel twine build
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: wheels
           path: wheels
@@ -135,12 +137,12 @@ jobs:
     needs:
       - test
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 

diff --git a/tests/files/app.lua b/tests/files/app.lua
@@ -206,15 +206,18 @@ function truncate()
     _truncate(box.space.no_schema_space)
 
     if box.space.sql_space ~= nil then
-        box.execute('DELETE FROM ' .. B:sql_space_name('sql_space'))
+        box.execute('DELETE FROM sql_space')
+        box.execute('DELETE FROM SQL_SPACE')
     end
 
     if box.space.sql_space_autoincrement ~= nil then
-        box.execute('DELETE FROM ' .. B:sql_space_name('sql_space_autoincrement'))
+        box.execute('DELETE FROM sql_space_autoincrement')
+        box.execute('DELETE FROM SQL_SPACE_AUTOINCREMENT')
     end
 
     if box.space.sql_space_autoincrement_multiple ~= nil then
-        box.execute('DELETE FROM ' .. B:sql_space_name('sql_space_autoincrement_multiple'))
+        box.execute('DELETE FROM sql_space_autoincrement_multiple')
+        box.execute('DELETE FROM SQL_SPACE_AUTOINCREMENT_MULTIPLE')
     end
 
     _truncate(box.space.tester_ext_dec)