Revert "Only support ?-params in DB2i"

Turns out that :name parameters are also supported in DB2i.

This reverts commit 4b2bc98.

src/languages/db2i/db2i.formatter.ts

@@ -171,7 +171,8 @@ export const db2i: DialectOptions = {
     ],
     identTypes: [`""-qq`],
     identChars: { first: '@#$', rest: '@#$' },
-    paramTypes: { positional: true },
+    paramTypes: { positional: true, named: [':'] },
+    paramChars: { first: '@#$', rest: '@#$' },
     operators: ['**', '¬=', '¬>', '¬<', '!>', '!<', '||'],
   },
   formatOptions: {

test/behavesLikeDb2Formatter.ts

@@ -11,6 +11,7 @@ import supportsConstraints from './features/constraints.js';
 import supportsDeleteFrom from './features/deleteFrom.js';
 import supportsCommentOn from './features/commentOn.js';
 import supportsIdentifiers from './features/identifiers.js';
+import supportsParams from './options/param.js';
 import supportsSetOperations from './features/setOperations.js';
 import supportsLimiting from './features/limiting.js';
 import supportsInsertInto from './features/insertInto.js';
@@ -51,6 +52,7 @@ export default function behavesLikeDb2Formatter(format: FormatFn) {
     'INTERSECT',
     'INTERSECT ALL',
   ]);
+  supportsParams(format, { positional: true, named: [':'] });
   supportsLimiting(format, { fetchFirst: true });
   supportsArrayLiterals(format, { withArrayPrefix: true });
   supportsArrayAndMapAccessors(format);
@@ -95,6 +97,18 @@ export default function behavesLikeDb2Formatter(format: FormatFn) {
     `);
   });
 
+  it('supports @, #, $ characters in named parameters', () => {
+    expect(format(`SELECT :foo@bar, :foo#bar, :foo$bar, :@zip, :#zap, :$zop`)).toBe(dedent`
+      SELECT
+        :foo@bar,
+        :foo#bar,
+        :foo$bar,
+        :@zip,
+        :#zap,
+        :$zop
+    `);
+  });
+
   it('supports WITH isolation level modifiers for UPDATE statement', () => {
     expect(format('UPDATE foo SET x = 10 WITH CS')).toBe(dedent`
       UPDATE foo

test/db2.test.ts

@@ -1,12 +1,9 @@
-import dedent from 'dedent-js';
-
 import { format as originalFormat, FormatFn } from '../src/sqlFormatter.js';
 import behavesLikeDb2Formatter from './behavesLikeDb2Formatter.js';
 
 import supportsCreateTable from './features/createTable.js';
 import supportsDropTable from './features/dropTable.js';
 import supportsJoin from './features/join.js';
-import supportsParams from './options/param.js';
 import supportsStrings from './features/strings.js';
 import supportsComments from './features/comments.js';
 import supportsOperators from './features/operators.js';
@@ -21,7 +18,6 @@ describe('Db2Formatter', () => {
   supportsCreateTable(format);
   supportsDropTable(format);
   supportsJoin(format, { without: ['NATURAL'] });
-  supportsParams(format, { positional: true, named: [':'] });
   supportsOperators(format, [
     '**',
     '%',
@@ -43,16 +39,4 @@ describe('Db2Formatter', () => {
   ]);
   // Additional U& string type in addition to others shared by all DB2 implementations
   supportsStrings(format, ["U&''"]);
-
-  it('supports @, #, $ characters in named parameters', () => {
-    expect(format(`SELECT :foo@bar, :foo#bar, :foo$bar, :@zip, :#zap, :$zop`)).toBe(dedent`
-      SELECT
-        :foo@bar,
-        :foo#bar,
-        :foo$bar,
-        :@zip,
-        :#zap,
-        :$zop
-    `);
-  });
 });

test/db2i.test.ts

@@ -6,7 +6,6 @@ import supportsCreateTable from './features/createTable.js';
 import supportsDropTable from './features/dropTable.js';
 import supportsJoin from './features/join.js';
 import supportsOperators from './features/operators.js';
-import supportsParams from './options/param.js';
 
 describe('Db2iFormatter', () => {
   const language = 'db2i';
@@ -21,6 +20,5 @@ describe('Db2iFormatter', () => {
     without: ['NATURAL'],
     additionally: ['EXCEPTION JOIN', 'LEFT EXCEPTION JOIN', 'RIGHT EXCEPTION JOIN'],
   });
-  supportsParams(format, { positional: true });
   supportsOperators(format, ['**', '¬=', '¬>', '¬<', '!>', '!<', '||']);
 });