Commit0686db5

Connell, Joseph

committed

Update duckdb Plugin to new duckdb/node-api (existing was depricated and breaking tests)

1 parent6a25813 commit0686db5Copy full SHA for 0686db5

File tree

+1555

-560

lines changed

server/node-service
- package.json
- src/plugins/duckdb
  - index.ts
- yarn.lock

+1555

-560

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,14 @@`
`37`	`37`	`"@aws-sdk/client-lambda":"^3.332.0",`
`38`	`38`	`"@aws-sdk/client-s3":"^3.332.0",`
`39`	`39`	`"@aws-sdk/s3-request-presigner":"^3.332.0",`
	`40`	`+"@duckdb/node-api":"^1.3.0-alpha.21",`
`40`	`41`	`"@google-cloud/bigquery":"^6.1.0",`
`41`	`42`	`"@google-cloud/storage":"^6.10.1",`
	`43`	`+"@opentelemetry/api":"^1.9.0",`
	`44`	`+"@opentelemetry/auto-instrumentations-node":"^0.59.0",`
	`45`	`+"@opentelemetry/sdk-metrics":"^2.0.1",`
	`46`	`+"@opentelemetry/sdk-node":"^0.201.1",`
	`47`	`+"@opentelemetry/sdk-trace-node":"^2.0.1",`
`42`	`48`	`"@supabase/supabase-js":"^2.26.0",`
`43`	`49`	`"@types/cors":"^2.8.17",`
`44`	`50`	`"@types/express":"^4.17.14",`
`@@ -52,7 +58,6 @@`
`52`	`58`	`"base64-arraybuffer":"^1.0.2",`
`53`	`59`	`"bluebird":"^3.7.2",`
`54`	`60`	`"cors":"^2.8.5",`
`55`		`-"duckdb-async":"^1.1.3",`
`56`	`61`	`"dynamodb-data-types":"^4.0.1",`
`57`	`62`	`"express":"^4.21.0",`
`58`	`63`	`"express-async-errors":"^3.1.1",`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import{DataSourcePlugin}from"lowcoder-sdk/dataSource";`
`2`	`2`	`importdataSourceConfig,{DataSourceDataType}from"./dataSourceConfig";`
`3`	`3`	`importqueryConfig,{ActionDataType}from"./queryConfig";`
`4`		`-import{Database}from"duckdb-async";`
	`4`	`+import{DuckDBInstance}from"@duckdb/node-api";`
`5`	`5`	`import{ServiceError}from"../../common/error";`
`6`	`6`
`7`	`7`	`// Helper function to handle BigInt serialization`
`@@ -23,17 +23,19 @@ const duckdbPlugin: DataSourcePlugin<ActionDataType, DataSourceDataType> = {`
`23`	`23`	`run:asyncfunction(actionData,dataSourceConfig):Promise<any>{`
`24`	`24`	`const{ databaseFile, options}=dataSourceConfig;`
`25`	`25`	`constparsedOptions=JSON.parse(options);`
`26`		`-constdb=awaitDatabase.create(databaseFile,parsedOptions);`
	`26`	`+constinstance=awaitDuckDBInstance.create(databaseFile,parsedOptions);`
	`27`	`+constdb=awaitinstance.connect();`
`27`	`28`
`28`	`29`	`if(actionData.actionName==="Query"){`
`29`	`30`	`try{`
`30`		`-constresult=awaitdb.all(actionData.queryString);`
	`31`	`+constresult=awaitdb.runAndReadAll(actionData.queryString);`
	`32`	`+constdata=awaitresult.getRows();`
`31`	`33`	`// Apply BigInt serialization to each row`
`32`		`-returnresult.map(serializeBigInts);`
	`34`	`+returndata.map(serializeBigInts);`
`33`	`35`	`}catch(error){`
`34`	`36`	`thrownewServiceError((errorasError).message);`
`35`	`37`	`}finally{`
`36`		`-awaitdb.close();`
	`38`	`+awaitdb.closeSync();`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`	`},`

Comments

(0)