fix next branch following rebase.

Author: igalklebanov

test/node/src/test-setup.ts

@@ -342,11 +342,17 @@ export function testSql(
 
 testSql.skip = function (
   _query: Compilable,
-  _dialect: BuiltInDialect,
-  _expectedPerDialect: PerDialect<{
+  _dialect: DialectDescriptor,
+  _expectedPerDialect: PerSQLDialect<{
     sql: string | string[]
     parameters: any[]
-  }>,
+  }> &
+    Partial<
+      Omit<
+        PerDialectVariant<{ sql: string | string[]; parameters: any[] }>,
+        keyof PerSQLDialect<any>
+      >
+    >,
 ) {
   // noop
 }

test/node/src/with-schema.test.ts

@@ -277,6 +277,34 @@ for (const dialect of DIALECTS) {
 
           await query.execute()
         })
+
+        for (const [selectModifierFn, clause] of [
+          ['forUpdate', 'for update'],
+          ['forShare', 'for share'],
+          ['forKeyShare', 'for key share'],
+          ['forNoKeyUpdate', 'for no key update'],
+        ] as const) {
+          it(`should not add schema to ${clause} tables`, async () => {
+            const query = ctx.db
+              .withSchema('mammals')
+              .selectFrom('pet')
+              .selectAll()
+              [selectModifierFn]('pet')
+              .skipLocked()
+
+            testSql(query, dialect, {
+              postgres: {
+                sql: `select * from "mammals"."pet" ${clause} of "pet" skip locked`,
+                parameters: [],
+              },
+              mysql: NOT_SUPPORTED,
+              mssql: NOT_SUPPORTED,
+              sqlite: NOT_SUPPORTED,
+            })
+
+            await query.execute()
+          })
+        }
       }
     })