diff --git a/webapp/packages/core-sdk/src/queries/grid/updateResultsData.gql b/webapp/packages/core-sdk/src/queries/grid/updateResultsData.gql
deleted file mode 100644
index 25708872a5..0000000000
--- a/webapp/packages/core-sdk/src/queries/grid/updateResultsData.gql
+++ /dev/null
@@ -1,27 +0,0 @@
-mutation updateResultsData(
-    $connectionId: ID!
-    $contextId: ID!
-    $resultsId: ID!
-    $sourceRowValues: [ Object ]!
-    $values: Object
-) {
-    result: updateResultsData(
-        connectionId: $connectionId
-        contextId: $contextId
-
-        resultsId: $resultsId
-        updateRow: $sourceRowValues
-
-        updateValues: $values
-    ) {
-        duration
-        filterText
-        results {
-            updateRowCount
-            resultSet {
-                id
-                rows
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/webapp/packages/core-sdk/src/sdk.ts b/webapp/packages/core-sdk/src/sdk.ts
index df22204e55..d7d2c2b7d2 100644
--- a/webapp/packages/core-sdk/src/sdk.ts
+++ b/webapp/packages/core-sdk/src/sdk.ts
@@ -285,8 +285,8 @@ export interface Mutation {
   testNetworkHandler: NetworkEndpointInfo;
   touchSession?: Maybe<Scalars['Boolean']>;
   updateConnection: ConnectionInfo;
-  updateResultsData?: Maybe<SqlExecuteInfo>;
-  updateResultsDataBatch?: Maybe<SqlExecuteInfo>;
+  updateResultsDataBatch: SqlExecuteInfo;
+  updateResultsDataBatchScript: Scalars['String'];
 }
 
 export interface MutationAsyncReadDataFromContainerArgs {
@@ -411,15 +411,16 @@ export interface MutationUpdateConnectionArgs {
   config: ConnectionConfig;
 }
 
-export interface MutationUpdateResultsDataArgs {
+export interface MutationUpdateResultsDataBatchArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
   resultsId: Scalars['ID'];
-  updateRow: Array<Maybe<Scalars['Object']>>;
-  updateValues?: Maybe<Scalars['Object']>;
+  updatedRows?: Maybe<SqlResultRow[]>;
+  deletedRows?: Maybe<SqlResultRow[]>;
+  addedRows?: Maybe<SqlResultRow[]>;
 }
 
-export interface MutationUpdateResultsDataBatchArgs {
+export interface MutationUpdateResultsDataBatchScriptArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
   resultsId: Scalars['ID'];
@@ -1572,24 +1573,6 @@ export interface GetSqlExecutionPlanResultMutation {
   );
 }
 
-export type UpdateResultsDataMutationVariables = Exact<{
-  connectionId: Scalars['ID'];
-  contextId: Scalars['ID'];
-  resultsId: Scalars['ID'];
-  sourceRowValues: Array<Maybe<Scalars['Object']>> | Maybe<Scalars['Object']>;
-  values?: Maybe<Scalars['Object']>;
-}>;
-
-export interface UpdateResultsDataMutation {
-  result?: Maybe<(
-    Pick<SqlExecuteInfo, 'duration' | 'filterText'>
-    & { results: Array<(
-      Pick<SqlQueryResults, 'updateRowCount'>
-      & { resultSet?: Maybe<Pick<SqlResultSet, 'id' | 'rows'>> }
-    )>; }
-  )>;
-}
-
 export type UpdateResultsDataBatchMutationVariables = Exact<{
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -1600,13 +1583,13 @@ export type UpdateResultsDataBatchMutationVariables = Exact<{
 }>;
 
 export interface UpdateResultsDataBatchMutation {
-  result?: Maybe<(
+  result: (
     Pick<SqlExecuteInfo, 'duration' | 'filterText'>
     & { results: Array<(
       Pick<SqlQueryResults, 'updateRowCount'>
       & { resultSet?: Maybe<Pick<SqlResultSet, 'id' | 'rows'>> }
     )>; }
-  )>;
+  );
 }
 
 export type MetadataGetNodeDdlQueryVariables = Exact<{
@@ -2551,27 +2534,6 @@ export const GetSqlExecutionPlanResultDocument = `
   }
 }
     `;
-export const UpdateResultsDataDocument = `
-    mutation updateResultsData($connectionId: ID!, $contextId: ID!, $resultsId: ID!, $sourceRowValues: [Object]!, $values: Object) {
-  result: updateResultsData(
-    connectionId: $connectionId
-    contextId: $contextId
-    resultsId: $resultsId
-    updateRow: $sourceRowValues
-    updateValues: $values
-  ) {
-    duration
-    filterText
-    results {
-      updateRowCount
-      resultSet {
-        id
-        rows
-      }
-    }
-  }
-}
-    `;
 export const UpdateResultsDataBatchDocument = `
     mutation updateResultsDataBatch($connectionId: ID!, $contextId: ID!, $resultsId: ID!, $updatedRows: [SQLResultRow!], $deletedRows: [SQLResultRow!], $addedRows: [SQLResultRow!]) {
   result: updateResultsDataBatch(
@@ -2956,9 +2918,6 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
     getSqlExecutionPlanResult(variables: GetSqlExecutionPlanResultMutationVariables): Promise<GetSqlExecutionPlanResultMutation> {
       return withWrapper(() => client.request<GetSqlExecutionPlanResultMutation>(GetSqlExecutionPlanResultDocument, variables));
     },
-    updateResultsData(variables: UpdateResultsDataMutationVariables): Promise<UpdateResultsDataMutation> {
-      return withWrapper(() => client.request<UpdateResultsDataMutation>(UpdateResultsDataDocument, variables));
-    },
     updateResultsDataBatch(variables: UpdateResultsDataBatchMutationVariables): Promise<UpdateResultsDataBatchMutation> {
       return withWrapper(() => client.request<UpdateResultsDataBatchMutation>(UpdateResultsDataBatchDocument, variables));
     },
diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index 8f428b42c7..03246a763a 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -143,13 +143,13 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
 
         this.requestInfo = {
           ...this.requestInfo,
-          requestDuration: response.result?.duration || 0,
+          requestDuration: response.result.duration || 0,
           requestMessage: 'Saved successfully',
           source: null,
         };
 
         const result = prevResults.find(result => result.id === update.resultId)!;
-        const responseResult = response.result?.results.find(result => result.resultSet?.id === update.resultId);
+        const responseResult = response.result.results.find(result => result.resultSet?.id === update.resultId);
 
         if (responseResult?.resultSet?.rows && result.data?.rows) {
           let i = 0;
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index 09da22d847..39afc1e424 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -83,13 +83,13 @@ export class QueryDataSource extends DatabaseDataSource<IDataQueryOptions, IData
 
         this.requestInfo = {
           ...this.requestInfo,
-          requestDuration: response.result?.duration || 0,
+          requestDuration: response.result.duration || 0,
           requestMessage: 'Saved successfully',
           source: this.options.query || null,
         };
 
         const result = prevResults.find(result => result.id === update.resultId)!;
-        const responseResult = response.result?.results.find(result => result.resultSet?.id === update.resultId);
+        const responseResult = response.result.results.find(result => result.resultSet?.id === update.resultId);
 
         if (responseResult?.resultSet?.rows && result.data?.rows) {
           let i = 0;