Skip to content

Feature: last_insert_uuid() function #2362

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.

Sign up for GitHub

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
fulghum merged 19 commits into from
Mar 6, 2024
Merged

Feature: last_insert_uuid() function #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ddf3ded
Very rough sketch of a last_insert_uuid() function
fulghum Mar 1, 2024
49b0dfd
Merge branch 'main' into fulghum/last_insert_uuid
fulghum Mar 1, 2024
8151d0b
Next rough pass on moving towards a new design
fulghum Mar 1, 2024
5084d19
Cleaning up inconsistent UUID function structs that weren't being ret…
fulghum Mar 1, 2024
937f83f
Renaming SetLastQueryInfo->SetLastQueryInfoInt and GetLastQueryInfo->…
fulghum Mar 1, 2024
5212f44
Added support for last_insert_uuid() to honor the swap flag from UUID…
fulghum Mar 1, 2024
6224380
Adding tests for UUID default columns that AREN'T part of the primary…
fulghum Mar 1, 2024
a3bc216
Tidying up
fulghum Mar 1, 2024
028e1c7
Fixing UUID unit tests from changes to return boolean
fulghum Mar 1, 2024
0621af8
Adding support for INSERT INTO ... SELECT ... statements
fulghum Mar 4, 2024
35d35f3
[ga-format-pr] Run ./format_repo.sh to fix formatting
fulghum Mar 4, 2024
2fd04e7
First pass on a different way of capturing the last_insert_uuid value
fulghum Mar 5, 2024
b86f7ae
Merge branch 'fulghum/last_insert_uuid' of https://github.com/dolthub…
fulghum Mar 5, 2024
42c7b2b
[ga-format-pr] Run ./format_repo.sh to fix formatting
fulghum Mar 5, 2024
278512b
Covering another edge case
fulghum Mar 6, 2024
1b3275b
Merge branch 'fulghum/last_insert_uuid' of https://github.com/dolthub…
fulghum Mar 6, 2024
0e43a56
Tidying up
fulghum Mar 6, 2024
38b7c52
Adding a test for prepared statements to ensure that previous UUID ca…
fulghum Mar 6, 2024
942ec65
Adding SkipResultsCheckOnServerEngine because executing a prepared st…
fulghum Mar 6, 2024
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
276 changes: 274 additions & 2 deletions enginetest/queries/script_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,11 +1202,11 @@ CREATE TABLE tab3 (
Assertions: []ScriptTestAssertion{
{
Query: `SELECT IS_UUID(UUID())`,
Expected: []sql.Row{{int8(1)}},
Expected: []sql.Row{{true}},
},
{
Query: `SELECT IS_UUID(@uuid)`,
Expected: []sql.Row{{int8(1)}},
Expected: []sql.Row{{true}},
},
{
Query: `SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid))`,
Expand Down Expand Up @@ -1354,6 +1354,278 @@ CREATE TABLE tab3 (
},
},
},
{
Name: "last_insert_uuid() behavior",
SetUpScript: []string{
"create table varchar36 (pk varchar(36) primary key default (UUID()), i int);",
"create table char36 (pk char(36) primary key default (UUID()), i int);",
"create table varbinary16 (pk varbinary(16) primary key default (UUID_to_bin(UUID())), i int);",
"create table binary16 (pk binary(16) primary key default (UUID_to_bin(UUID())), i int);",
"create table binary16swap (pk binary(16) primary key default (UUID_to_bin(UUID(), true)), i int);",
"create table invalid (pk int primary key, c1 varchar(36) default (UUID()));",
"create table prepared (uuid char(36) default (UUID()), ai int auto_increment, c1 varchar(100), primary key (uuid, ai));",
},
Assertions: []ScriptTestAssertion{
// The initial value of last_insert_uuid() is an empty string
{
Query: "select last_insert_uuid()",
Expected: []sql.Row{{""}},
},

// invalid table – UUID default is not a primary key, so last_insert_uuid() doesn't get udpated
{
Query: "insert into invalid values (1, DEFAULT);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select last_insert_uuid()",
Expected: []sql.Row{{""}},
},
{
Query: "insert into invalid values (2, UUID());",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select last_insert_uuid()",
Expected: []sql.Row{{""}},
},

// varchar(36) test cases...
{
Query: "insert into varchar36 values (DEFAULT, 1);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from varchar36 where i=1);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into varchar36 values (UUID(), 2), (UUID(), 3);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2}}},
},
{
// last_insert_uuid() reports the first UUID() generated in the last insert statement
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from varchar36 where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into varchar36 values ('notta-uuid', 4);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
// The previous insert didn't generate a UUID, so last_insert_uuid() doesn't get updated
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from varchar36 where i=2);",
Expected: []sql.Row{{true, true}},
},

// char(36) test cases...
{
Query: "insert into char36 values (DEFAULT, 1);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from char36 where i=1);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into char36 values (UUID(), 2), (UUID(), 3);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2}}},
},
{
// last_insert_uuid() reports the first UUID() generated in the last insert statement
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from char36 where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into char36 values ('notta-uuid', 4);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
// The previous insert didn't generate a UUID, so last_insert_uuid() doesn't get updated
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from char36 where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into char36 (i) values (5);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from char36 where i=5);",
Expected: []sql.Row{{true, true}},
},

// varbinary(16) test cases...
{
Query: "insert into varbinary16 values (DEFAULT, 1);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from varbinary16 where i=1);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into varbinary16 values (UUID_to_bin(UUID()), 2), (UUID_to_bin(UUID()), 3);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2}}},
},
{
// last_insert_uuid() reports the first UUID() generated in the last insert statement
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from varbinary16 where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into varbinary16 values ('notta-uuid', 4);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
// The previous insert didn't generate a UUID, so last_insert_uuid() doesn't get updated
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from varbinary16 where i=2);",
Expected: []sql.Row{{true, true}},
},

// binary(16) test cases...
{
Query: "insert into binary16 values (DEFAULT, 1);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from binary16 where i=1);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into binary16 values (UUID_to_bin(UUID()), 2), (UUID_to_bin(UUID()), 3);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2}}},
},
{
// last_insert_uuid() reports the first UUID() generated in the last insert statement
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from binary16 where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into binary16 values ('notta-uuid', 4);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
// The previous insert didn't generate a UUID, so last_insert_uuid() doesn't get updated
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from binary16 where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into binary16 (i) values (5);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk) from binary16 where i=5);",
Expected: []sql.Row{{true, true}},
},

// binary(16) with UUID_to_bin swap test cases...
{
Query: "insert into binary16swap values (DEFAULT, 1);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk, true) from binary16swap where i=1);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into binary16swap values (UUID_to_bin(UUID(), true), 2), (UUID_to_bin(UUID(), true), 3);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2}}},
},
{
// last_insert_uuid() reports the first UUID() generated in the last insert statement
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk, true) from binary16swap where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into binary16swap values ('notta-uuid', 4);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
// The previous insert didn't generate a UUID, so last_insert_uuid() doesn't get updated
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk, true) from binary16swap where i=2);",
Expected: []sql.Row{{true, true}},
},
{
Query: "insert into binary16swap (i) values (5);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select bin_to_uuid(pk, true) from binary16swap where i=5);",
Expected: []sql.Row{{true, true}},
},

// INSERT INTO ... SELECT ... Tests
{
// If we populate the UUID column (pk) with its implicit default, then it updates last_insert_uuid()
Query: "insert into varchar36 (i) select 42 from dual;",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from varchar36 where i=42);",
Expected: []sql.Row{{true, true}},
},
{
// If all values come from another table, the auto_uuid value shouldn't be generated, so last_insert_uuid() doesn't change
Query: "insert into varchar36 (pk, i) (select 'one', 101 from dual union all select 'two', 202);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2}}},
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select pk from varchar36 where i=42);",
Expected: []sql.Row{{true, true}},
},

// Prepared statements
{
// Test with an insert statement that implicit uses the UUID column default
Query: `prepare stmt1 from "insert into prepared (c1) values ('odd'), ('even')";`,
Expected: []sql.Row{{types.OkResult{Info: plan.PrepareInfo{}}}},
},
{
Query: "execute stmt1;",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 1}}},
SkipResultCheckOnServerEngine: true, // Server engine returns []sql.Row{}
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select uuid from prepared where ai=1), last_insert_id();",
Expected: []sql.Row{{true, true, uint64(1)}},
},
{
// Executing the prepared statement a second time should refresh last_insert_uuid()
Query: "execute stmt1;",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 3}}},
SkipResultCheckOnServerEngine: true, // Server engine returns []sql.Row{}
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select uuid from prepared where ai=3), last_insert_id();",
Expected: []sql.Row{{true, true, uint64(3)}},
},

{
// Test with an insert statement that explicitly uses the UUID column default
Query: `prepare stmt2 from "insert into prepared (uuid, c1) values (DEFAULT, 'more'), (DEFAULT, 'less')";`,
Expected: []sql.Row{{types.OkResult{Info: plan.PrepareInfo{}}}},
},
{
Query: "execute stmt2;",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 5}}},
SkipResultCheckOnServerEngine: true, // Server engine returns []sql.Row{}
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select uuid from prepared where ai=5), last_insert_id();",
Expected: []sql.Row{{true, true, uint64(5)}},
},
{
// Executing the prepared statement a second time should refresh last_insert_uuid()
Query: "execute stmt2;",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 7}}},
SkipResultCheckOnServerEngine: true, // Server engine returns []sql.Row{}
},
{
Query: "select is_uuid(last_insert_uuid()), last_insert_uuid() = (select uuid from prepared where ai=7), last_insert_id();",
Expected: []sql.Row{{true, true, uint64(7)}},
},
},
},
{
Name: "last_insert_id() behavior",
SetUpScript: []string{
Expand Down
Loading