Cleaning up some leftovers from #7836

firebase-vscode/package.json

@@ -80,14 +80,6 @@
         }
       }
     },
-    "keybindings": [
-      {
-        "command": "firebase.dataConnect.executeOperationAtCursor",
-        "key": "ctrl+enter",
-        "mac": "cmd+enter",
-        "when": "editorLangId == gql || editorLangId == graphql"
-      }
-    ],
     "viewsContainers": {
       "activitybar": [
         {

src/emulator/dataconnect/pgliteServer.ts

@@ -5,7 +5,7 @@
 // They are only available as ESM, and if we import them normally,
 // our tsconfig will convert them to requires, which will cause errors
 // during module resolution.
 const { dynamicImport } = require(true && "../../dynamicImport");
 import * as net from "node:net";
 import * as fs from "fs";
 
@@ -17,6 +17,17 @@
 } from "./pg-gateway/index";
 import { fromNodeSocket } from "./pg-gateway/platforms/node";
 import { logger } from "../../logger";
+export const TRUNCATE_TABLES_SQL = `
+DO $do$
+BEGIN
+   EXECUTE
+   (SELECT 'TRUNCATE TABLE ' || string_agg(oid::regclass::text, ', ') || ' CASCADE'
+    FROM   pg_class
+    WHERE  relkind = 'r'
+    AND    relnamespace = 'public'::regnamespace
+   );
+END
+$do$;`;
 
 export class PostgresServer {
   private username: string;
@@ -25,10 +36,10 @@
   private importPath?: string;
 
   public db: PGlite | undefined = undefined;
   public async createPGServer(host: string = "127.0.0.1", port: number): Promise<net.Server> {
     const getDb = this.getDb.bind(this);
 
     const server = net.createServer(async (socket) => {
       const connection: PostgresConnection = await fromNodeSocket(socket, {
         serverVersion: "16.3 (PGlite 0.2.0)",
         auth: { method: "trust" },
@@ -42,11 +53,11 @@
           const result = await db.execProtocolRaw(data);
           // Extended query patch removes the extra Ready for Query messages that
           // pglite wrongly sends.
           return extendedQueryPatch.filterResponse(data, result);
         },
       });
 
       const extendedQueryPatch: PGliteExtendedQueryPatch = new PGliteExtendedQueryPatch(connection);
 
       socket.on("end", () => {
         logger.debug("Postgres client disconnected");
@@ -69,8 +80,8 @@
     if (!this.db) {
       // Not all schemas will need vector installed, but we don't have an good way
       // to swap extensions after starting PGLite, so we always include it.
       const vector = (await dynamicImport("@electric-sql/pglite/vector")).vector;
       const uuidOssp = (await dynamicImport("@electric-sql/pglite/contrib/uuid_ossp")).uuid_ossp;
       const pgliteArgs: PGliteOptions = {
         username: this.username,
         database: this.database,
@@ -95,17 +106,7 @@
 
   public async clearDb(): Promise<void> {
     const db = await this.getDb();
-    await db.query(`
-DO $do$
-BEGIN
-   EXECUTE
-   (SELECT 'TRUNCATE TABLE ' || string_agg(oid::regclass::text, ', ') || ' CASCADE'
-    FROM   pg_class
-    WHERE  relkind = 'r'
-    AND    relnamespace = 'public'::regnamespace
-   );
-END
-$do$;`);
+    await db.query(TRUNCATE_TABLES_SQL);
   }
 
   public async exportData(exportPath: string): Promise<void> {

src/emulator/dataconnectEmulator.ts

@@ -1,4 +1,5 @@
 import * as childProcess from "child_process";
+import * as pg from "pg";
 import { EventEmitter } from "events";
 import * as clc from "colorette";
 import * as path from "path";
@@ -17,7 +18,7 @@ import { EmulatorRegistry } from "./registry";
 import { logger } from "../logger";
 import { load } from "../dataconnect/load";
 import { Config } from "../config";
-import { PostgresServer } from "./dataconnect/pgliteServer";
+import { PostgresServer, TRUNCATE_TABLES_SQL } from "./dataconnect/pgliteServer";
 import { cleanShutdown } from "./controller";
 import { connectableHostname } from "../utils";
 
@@ -180,6 +181,10 @@ export class DataConnectEmulator implements EmulatorInstance {
   async clearData(): Promise<void> {
     if (this.postgresServer) {
       await this.postgresServer.clearDb();
+    } else {
+      const conn = new pg.Client(dataConnectLocalConnString());
+      await conn.query(TRUNCATE_TABLES_SQL);
+      await conn.end();
     }
   }
 

src/emulator/types.ts

@@ -36,7 +36,12 @@ export const DOWNLOADABLE_EMULATORS = [
   Emulators.DATACONNECT,
 ];
 
-export type ImportExportEmulators = Emulators.FIRESTORE | Emulators.DATABASE | Emulators.AUTH;
+export type ImportExportEmulators =
+  | Emulators.FIRESTORE
+  | Emulators.DATABASE
+  | Emulators.AUTH
+  | Emulators.STORAGE
+  | Emulators.DATACONNECT;
 export const IMPORT_EXPORT_EMULATORS = [
   Emulators.FIRESTORE,
   Emulators.DATABASE,