diff --git a/modules/notes/notes_ajax_content.php b/modules/notes/notes_ajax_content.php index 7a6d7b3bf00e4e702c1438add5b9387a183f6c7c..56c8cd6b62f6d77856469561b6b12259411db2a0 100755 --- a/modules/notes/notes_ajax_content.php +++ b/modules/notes/notes_ajax_content.php @@ -251,7 +251,7 @@ switch ($mode) { ); //Last insert ID from sequence - $id = $db->lastInsertId('notes_seq'); + $id = $db->lastInsertId('notes_id_seq'); //Entities selected if (!empty($id) && isset($_REQUEST['entities_chosen']) && !empty($_REQUEST['entities_chosen'])) diff --git a/sql/delete_all_ressources.sql b/sql/delete_all_ressources.sql index 88d3cfaa8d0ca903d90a5e39e194b3081a8c5245..d71171c1c122570644d4255b45768f3ada3dc667 100755 --- a/sql/delete_all_ressources.sql +++ b/sql/delete_all_ressources.sql @@ -34,7 +34,7 @@ TRUNCATE TABLE history_batch; ALTER SEQUENCE history_batch_id_seq restart WITH 1; TRUNCATE TABLE notes; -ALTER SEQUENCE notes_seq restart WITH 1; +ALTER SEQUENCE notes_id_seq restart WITH 1; TRUNCATE TABLE note_entities; diff --git a/sql/develop.sql b/sql/develop.sql index efa950959e23d92906c20e3c76b6b525da73050c..8e81a73a3325e24c4f6f5a2268caac8b587b3c18 100755 --- a/sql/develop.sql +++ b/sql/develop.sql @@ -151,6 +151,7 @@ ALTER TABLE res_letterbox ALTER COLUMN locker_user_id SET DEFAULT NULL; ALTER TABLE notes DROP COLUMN IF EXISTS tablename; ALTER TABLE notes DROP COLUMN IF EXISTS coll_id; ALTER TABLE notes RENAME COLUMN date_note TO creation_date; +ALTER sequence notes_seq RENAME TO notes_id_seq; /* PARAM LIST DISPLAY */ diff --git a/sql/reinit_sequences.sql b/sql/reinit_sequences.sql index 5a411c504757bf2b2d75f285e2ba9ff0fae6b307..389e3a51746db9df99790f7573df6c0163129ec9 100755 --- a/sql/reinit_sequences.sql +++ b/sql/reinit_sequences.sql @@ -20,7 +20,7 @@ select setval('res_attachment_res_id_seq', (select max(res_id)+1 from res_attach select setval('res_linked_mlb_seq', (select max(id)+1 from res_linked), false); select setval('notif_email_stack_seq', (select max(email_stack_sid)+1 from notif_email_stack), false); select setval('notif_event_stack_seq', (select max(event_stack_sid)+1 from notif_event_stack), false); -select setval('notes_seq', (select max(id)+1 from notes), false); +select setval('notes_id_seq', (select max(id)+1 from notes), false); select setval('notes_entities_id_seq', (select max(id)+1 from note_entities), false); select setval('listinstance_id_seq', (select max(listinstance_id)+1 from listinstance), false); select setval('listinstance_history_id_seq', (select max(listinstance_history_id)+1 from listinstance_history), false); diff --git a/src/app/note/models/NoteModel.php b/src/app/note/models/NoteModel.php index 817d7b74e6123025cb27faa65d47076e32988665..6b04cbd04dfac1b76ccf628ec62e1f5aa5a9d3c4 100755 --- a/src/app/note/models/NoteModel.php +++ b/src/app/note/models/NoteModel.php @@ -108,7 +108,7 @@ class NoteModel ValidatorModel::notEmpty($aArgs, ['identifier', 'note_text']); ValidatorModel::intVal($aArgs, ['identifier']); - $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'notes_seq']); + $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'notes_id_seq']); DatabaseModel::insert([ 'table' => 'notes',