Skip to content

Commit

Permalink
Fix table contraint and index SQL scripts (#220)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arkatufus
Arkatufus authored Apr 17, 2023
1 parent 82beb35 commit 1aca63e
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 106 deletions.
1 change: 1 addition & 0 deletions src/Akka.Persistence.Sql/Db/AkkaPersistenceDataConnectionFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ private static void MapTagRow(

.Member(r => r.PersistenceId)
.HasColumnName(tagColumns.PersistenceId)
.HasLength(255)
.IsNullable(false)

.Member(r => r.SequenceNumber)
Expand Down
207 changes: 101 additions & 106 deletions src/Akka.Persistence.Sql/Db/FooterGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,48 +54,49 @@ FROM sys.indexes
#region MySql
if (config.ProviderName.StartsWith(ProviderName.MySql))
return $@";
DROP PROCEDURE IF EXISTS AKKA_Journal_Setup;
DELIMITER ??
CREATE PROCEDURE AKKA_Journal_Setup()
BEGIN
DECLARE UniqueExists TINYINT UNSIGNED DEFAULT 0;
DECLARE CreatedIndexExists TINYINT UNSIGNED DEFAULT 0;
DECLARE SequenceIndexExists TINYINT UNSIGNED DEFAULT 0;
SELECT 1 INTO UniqueExists
FROM information_schema.TABLE_CONSTRAINTS
WHERE
CONSTRAINT_SCHEMA = DATABASE() AND
TABLE_NAME = '{tableName}' AND
CONSTRAINT_NAME = '{columns.PersistenceId}' AND
CONSTRAINT_TYPE = 'UNIQUE';
SELECT 1 INTO CreatedIndexExists
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.Created}_idx';
SELECT 1 INTO SequenceIndexExists
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.SequenceNumber}_idx';
IF (UniqueExists = 0) THEN
ALTER TABLE {journalFullTableName} ADD UNIQUE ({columns.PersistenceId}, {columns.SequenceNumber});
END IF;
IF (CreatedIndexExists = 0) THEN
CREATE INDEX {tableName}_{columns.Created}_idx ON {journalFullTableName} ({columns.Created});
END IF;
IF (SequenceIndexExists = 0) THEN
CREATE INDEX {tableName}_{columns.SequenceNumber}_idx ON {journalFullTableName} ({columns.SequenceNumber});
END IF;
END??
DELIMITER ;
CALL AKKA_Journal_Setup();
DROP PROCEDURE IF EXISTS AKKA_Journal_Setup;";
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.TABLE_CONSTRAINTS
WHERE
CONSTRAINT_SCHEMA = DATABASE() AND
TABLE_NAME = '{tableName}' AND
CONSTRAINT_NAME = '{columns.PersistenceId}' AND
CONSTRAINT_TYPE = 'UNIQUE'
),
'SELECT ''Unique constraint already exist. Skipping.'';',
'ALTER TABLE {journalFullTableName} ADD UNIQUE ({columns.PersistenceId}, {columns.SequenceNumber})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.Created}_idx'
),
'SELECT ''Index {tableName}_{columns.Created}_idx already exist. Skipping.'';',
'CREATE INDEX {tableName}_{columns.Created}_idx ON {journalFullTableName} ({columns.Created})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.SequenceNumber}_idx'
),
'SELECT ''Index {tableName}_{columns.SequenceNumber}_idx already exist. Skipping.'';',
'CREATE INDEX {tableName}_{columns.SequenceNumber}_idx ON {journalFullTableName} ({columns.SequenceNumber})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;";
#endregion

#region PostgreSql
Expand All @@ -116,10 +117,10 @@ when duplicate_table
end;
begin
create index {tableName}_{columns.PersistenceId}_idx on {journalFullTableName} ({columns.PersistenceId});
create index {tableName}_{columns.Created}_idx on {journalFullTableName} ({columns.Created});
exception
when duplicate_table
then raise notice 'index ""{tableName}_{columns.PersistenceId}_idx"" on {journalFullTableName} already exists, skipping';
then raise notice 'index ""{tableName}_{columns.Created}_idx"" on {journalFullTableName} already exists, skipping';
end;
begin
Expand All @@ -138,7 +139,7 @@ when duplicate_table
if (config.ProviderName.StartsWith(ProviderName.SQLite))
return $@";
CREATE UNIQUE INDEX IF NOT EXISTS {tableName}_uq ON {journalFullTableName} ({columns.PersistenceId}, {columns.SequenceNumber});
CREATE INDEX IF NOT EXISTS {tableName}_{columns.PersistenceId}_idx ON {journalFullTableName} ({columns.PersistenceId});
CREATE INDEX IF NOT EXISTS {tableName}_{columns.Created}_idx ON {journalFullTableName} ({columns.Created});
CREATE INDEX IF NOT EXISTS {tableName}_{columns.SequenceNumber}_idx ON {journalFullTableName} ({columns.SequenceNumber});";
#endregion

Expand Down Expand Up @@ -178,35 +179,32 @@ FROM sys.indexes
#region MySql
if (config.ProviderName.StartsWith(ProviderName.MySql))
return $@";
DROP PROCEDURE IF EXISTS AKKA_Tag_Setup;
DELIMITER ??
CREATE PROCEDURE AKKA_Tag_Setup()
BEGIN
DECLARE DeleteIndexExists TINYINT UNSIGNED DEFAULT 0;
DECLARE TagIndexExists TINYINT UNSIGNED DEFAULT 0;
SELECT 1 INTO DeleteIndexExists
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.PersistenceId}_{columns.SequenceNumber}_idx';
SELECT 1 INTO TagIndexExists
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.Tag}_idx';
IF (DeleteIndexExists = 0) THEN
CREATE INDEX {tableName}_{columns.PersistenceId}_{columns.SequenceNumber}_idx ON {tagFullTableName} ({columns.PersistenceId}, {columns.SequenceNumber});
END IF;
IF (TagIndexExists = 0) THEN
CREATE INDEX {tableName}_{columns.Tag}_idx ON {tagFullTableName} ({columns.Tag});
END IF;
END??
DELIMITER ;
CALL AKKA_Journal_Setup();
DROP PROCEDURE IF EXISTS AKKA_Tag_Setup;";
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.PersistenceId}_{columns.SequenceNumber}_idx'
),
'SELECT ''Index {tableName}_{columns.PersistenceId}_{columns.SequenceNumber}_idx already exist. Skipping.'';',
'CREATE INDEX {tableName}_{columns.PersistenceId}_{columns.SequenceNumber}_idx ON {tagFullTableName} ({columns.PersistenceId}, {columns.SequenceNumber})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.Tag}_idx'
),
'SELECT ''Index {tableName}_{columns.Tag}_idx already exist. Skipping.'';',
'CREATE INDEX {tableName}_{columns.Tag}_idx ON {tagFullTableName} ({columns.Tag})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;";
#endregion

#region PostgreSql
Expand Down Expand Up @@ -280,35 +278,32 @@ FROM sys.indexes
#region MySql
if (config.ProviderName.StartsWith(ProviderName.MySql))
return $@";
DROP PROCEDURE IF EXISTS AKKA_Journal_Setup;
DELIMITER ??
CREATE PROCEDURE AKKA_Journal_Setup()
BEGIN
DECLARE CreatedIndexExists TINYINT UNSIGNED DEFAULT 0;
DECLARE SequenceIndexExists TINYINT UNSIGNED DEFAULT 0;
SELECT 1 INTO CreatedIndexExists
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.Created}_idx';
SELECT 1 INTO SequenceIndexExists
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.SequenceNumber}_idx';
IF (CreatedIndexExists = 0) THEN
CREATE INDEX {tableName}_{columns.Created}_idx ON {fullTableName} ({columns.Created});
END IF;
IF (SequenceIndexExists = 0) THEN
CREATE INDEX {tableName}_{columns.SequenceNumber}_idx ON {fullTableName} ({columns.SequenceNumber});
END IF;
END??
DELIMITER ;
CALL AKKA_Journal_Setup();
DROP PROCEDURE IF EXISTS AKKA_Journal_Setup;";
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.SequenceNumber}_idx'
),
'SELECT ''Index {tableName}_{columns.SequenceNumber}_idx already exist. Skipping.'';',
'CREATE INDEX {tableName}_{columns.SequenceNumber}_idx ON {fullTableName} ({columns.SequenceNumber})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;
SET @akka_journal_setup = IF(
EXISTS (
SELECT 1
FROM information_schema.INNODB_INDEXES
WHERE NAME = '{tableName}_{columns.Created}_idx'
),
'SELECT ''Index {tableName}_{columns.Created}_idx already exist. Skipping.'';',
'CREATE INDEX {tableName}_{columns.Created}_idx ON {fullTableName} ({columns.Created})'
);
PREPARE akka_statement_journal_setup FROM @akka_journal_setup;
EXECUTE akka_statement_journal_setup;
DEALLOCATE PREPARE akka_statement_journal_setup;";
#endregion

#region PostgreSql
Expand All @@ -322,17 +317,17 @@ FROM information_schema.INNODB_INDEXES
do $BLOCK$
begin
begin
create index {tableName}_{columns.PersistenceId}_idx on {fullTableName} ({columns.PersistenceId});
create index {tableName}_{columns.SequenceNumber}_idx on {fullTableName} ({columns.SequenceNumber});
exception
when duplicate_table
then raise notice 'index ""{tableName}_{columns.PersistenceId}_idx"" on {fullTableName} already exists, skipping';
then raise notice 'index ""{tableName}_{columns.SequenceNumber}_idx"" on {fullTableName} already exists, skipping';
end;
begin
create index {tableName}_{columns.SequenceNumber}_idx on {fullTableName} ({columns.SequenceNumber});
create index {tableName}_{columns.Created}_idx on {fullTableName} ({columns.Created});
exception
when duplicate_table
then raise notice 'index ""{tableName}_{columns.SequenceNumber}_idx"" on {fullTableName} already exists, skipping';
then raise notice 'index ""{tableName}_{columns.Created}_idx"" on {fullTableName} already exists, skipping';
end;
end;
$BLOCK$
Expand All @@ -343,8 +338,8 @@ when duplicate_table
#region Sqlite
if (config.ProviderName.StartsWith(ProviderName.SQLite))
return $@";
CREATE INDEX IF NOT EXISTS {tableName}_{columns.PersistenceId}_idx ON {fullTableName} ({columns.PersistenceId});
CREATE INDEX IF NOT EXISTS {tableName}_{columns.SequenceNumber}_idx ON {fullTableName} ({columns.SequenceNumber});";
CREATE INDEX IF NOT EXISTS {tableName}_{columns.SequenceNumber}_idx ON {fullTableName} ({columns.SequenceNumber});
CREATE INDEX IF NOT EXISTS {tableName}_{columns.Created}_idx ON {fullTableName} ({columns.Created});";
#endregion

return null;
Expand Down

0 comments on commit 1aca63e

Please sign in to comment.