Merge pull request #7 from supabase-community/fix/large-sql-memory-error

fix: memory error when parsing large sql

Author: gregnr

packages/pg-parser/Makefile

@@ -16,7 +16,8 @@ LDFLAGS = -Wl,--gc-sections,--strip-all \
 		--no-entry \
 		-sFILESYSTEM=0 \
 		-sEXPORT_NAME="$(WASM_MODULE_NAME)" \
-		-sEXPORTED_RUNTIME_METHODS=ccall,cwrap,getValue,UTF8ToString \
+		-sEXPORTED_RUNTIME_METHODS="['HEAP8','getValue','UTF8ToString','stringToUTF8']" \
+		-sEXPORTED_FUNCTIONS="['_malloc', '_free']" \
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=1
 

packages/pg-parser/src/pg-parser.test.ts

@@ -1,9 +1,13 @@
+/// <reference path="../test/types/sql.d.ts" />
+
 import { stripIndent } from 'common-tags';
 import { describe, expect, it } from 'vitest';
 import { PgParser } from './pg-parser.js';
 import type { ParseResult } from './types/index.js';
 import { isParseResultVersion, unwrapParseResult } from './util.js';
 
+import sqlDump from '../test/fixtures/dump.sql';
+
 describe('pg-parser', () => {
   it('parses sql in v15', async () => {
     const pgParser = new PgParser({ version: 15 });
@@ -28,6 +32,17 @@ describe('pg-parser', () => {
     expect(create).toThrow('unsupported version');
   });
 
+  it('parses large sql', async () => {
+    const pgParser = new PgParser();
+    const result = await unwrapParseResult(pgParser.parse(sqlDump));
+
+    if (!result.stmts) {
+      throw new Error('stmts not found');
+    }
+
+    expect(result.stmts.length).toBeGreaterThan(0);
+  });
+
   it('parses sql into ast', async () => {
     const pgParser = new PgParser();
     const result = await unwrapParseResult(pgParser.parse('SELECT 1+1 as sum'));

packages/pg-parser/src/pg-parser.ts

@@ -73,9 +73,14 @@ export class PgParser<Version extends SupportedVersion = 17> {
   async parse(sql: string) {
     const module = await this.#module;
 
-    const resultPtr = module.ccall('parse_sql', 'number', ['string'], [sql]);
+    const sqlPtr = module._malloc(sql.length + 1); // +1 for null terminator
+    module.stringToUTF8(sql, sqlPtr, sql.length + 1);
+
+    const resultPtr = module._parse_sql(sqlPtr);
+    module._free(sqlPtr);
+
     const parseResult = await this.#parsePgQueryParseResult(resultPtr);
-    module.ccall('free_parse_result', undefined, ['number'], [resultPtr]);
+    module._free_parse_result(resultPtr);
 
     return parseResult;
   }