Skip to content

feat: support DML with Returning clause in Connection API #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
55ae7db
feat: incorporate dml with returning clause
rajatbhatta Aug 17, 2022
f20d02f
feat: changes
rajatbhatta Aug 17, 2022
e06d436
feat: change handling of AsyncResultSet.
rajatbhatta Aug 17, 2022
bfbacfa
fix: lint
rajatbhatta Aug 17, 2022
3807e5f
doc: add comments
rajatbhatta Aug 17, 2022
595ee17
fix: lint
rajatbhatta Aug 17, 2022
f1326ff
test: add tests for executeBatchUpdate
rajatbhatta Aug 19, 2022
3f069bd
test: import fix
rajatbhatta Aug 19, 2022
ba692dc
test: remove redundant import
rajatbhatta Aug 19, 2022
ff3c0ff
test: add abort tests for dml returning
rajatbhatta Aug 19, 2022
5d1c0e5
test: add pg dml returning tests
rajatbhatta Aug 22, 2022
edaad92
feat: change error statement
rajatbhatta Aug 22, 2022
24cf255
doc: add doc for dml with returning clause usage
rajatbhatta Aug 22, 2022
3284f66
Merge branch 'googleapis:main' into dml-returning-parsing-changes
rajatbhatta Aug 22, 2022
4024412
Update google-cloud-spanner/src/main/java/com/google/cloud/spanner/co…
rajatbhatta Aug 23, 2022
4ae2f8d
Update google-cloud-spanner/src/main/java/com/google/cloud/spanner/co…
rajatbhatta Aug 23, 2022
c601a50
fix: incorporate review comments
rajatbhatta Aug 23, 2022
14e741f
test: add more test cases
rajatbhatta Aug 23, 2022
64422eb
test: add todo
rajatbhatta Aug 23, 2022
82e35fe
test: add separate abort tests for dml returning
rajatbhatta Aug 23, 2022
a7db0c1
fix: add try-with-resources block around ResultSet
rajatbhatta Aug 23, 2022
cc00396
feat: enhancement by adding a pre-check
rajatbhatta Aug 24, 2022
c093b9b
feat: changes
rajatbhatta Aug 24, 2022
4af9cbe
test: delete unnecessary test
rajatbhatta Aug 24, 2022
9f59715
test: add few more tests to PG parser
rajatbhatta Aug 24, 2022
218c3b7
feat: method doc update
rajatbhatta Aug 25, 2022
ea4152f
test: nit fixes
rajatbhatta Aug 26, 2022
e2a463e
feat: handle another corner case
rajatbhatta Aug 30, 2022
60fcb4c
test: add another test
rajatbhatta Aug 30, 2022
2c862c4
Merge branch 'main' into dml-returning-parsing-changes
rajatbhatta Nov 9, 2022
58d0278
clirr fixes
rajatbhatta Nov 9, 2022
81b7908
revert env for integration tests
rajatbhatta Nov 9, 2022
d0e173d
remove comments
rajatbhatta Nov 9, 2022
9e15159
skip returning tests in emulator
rajatbhatta Nov 9, 2022
ac3ea4f
fix: linting
rajatbhatta Nov 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
skip returning tests in emulator
  • Loading branch information
rajatbhatta committed Nov 9, 2022
commit 9e151592b8ab50125aae858243fed8677f71fc5a
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;

import com.google.cloud.spanner.AsyncResultSet;
import com.google.cloud.spanner.AsyncResultSet.CallbackResponse;
Expand All @@ -38,6 +39,7 @@
import com.google.cloud.spanner.connection.StatementResult;
import com.google.cloud.spanner.connection.StatementResult.ResultType;
import com.google.cloud.spanner.connection.TransactionMode;
import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
Expand All @@ -49,6 +51,7 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -107,6 +110,8 @@ private boolean checkAndSetInitialized() {

@Before
public void setupTable() {
assumeFalse(
"DML Returning is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
if (checkAndSetInitialized()) {
database =
env.getTestHelper()
Expand Down