Fix sequence's start value computation

fljdin · fljdin · commit 2ece20f23b1b · 2023-10-05T14:10:08.000+02:00
Start a sequence at a value as close as possible to the expected value. Closes #38
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,10 @@
 - Call the translation function on index expressions.  
   Patch by Florent Jardin.
 
+- Fix sequence's start value computation by taking into account the increment
+  value.  
+  Patch by Florent Jardin.
+
 # Version 1.0.0, released 2023-02-08 #
 
 ## Enhancements: ##
diff --git a/db_migrator--1.1.0.sql b/db_migrator--1.1.0.sql
@@ -1671,7 +1671,7 @@ BEGIN
             sch, seq, incr,
             CASE WHEN minv IS NULL THEN 'NO MINVALUE' ELSE 'MINVALUE ' || minv END,
             CASE WHEN maxv IS NULL THEN 'NO MAXVALUE' ELSE 'MAXVALUE ' || maxv END,
-            lastval + 1, cachesiz,
+            lastval + incr, cachesiz,
             CASE WHEN cycl THEN '' ELSE 'NO ' END);
       RETURN next;
    END LOOP;
diff --git a/test/sql/setup.sql b/test/sql/setup.sql
@@ -23,6 +23,7 @@ part1	part1
 
 COPY pgsql_stage.sequences (schema, sequence_name, min_value, max_value, increment_by, cyclical, cache_size, last_value, orig_value) FROM stdin;
 sch1	seq1	1	100	1	f	10	1	1
+sch1	seq2	1	100	10	f	1	10	10
 \.
 
 COPY pgsql_stage.tables (schema, table_name, orig_table, migrate) FROM stdin;
diff --git a/test/sql/tables.sql b/test/sql/tables.sql
@@ -14,7 +14,8 @@ SELECT results_eq(
 SELECT results_eq(
     $$ SELECT statement FROM extschema.construct_sequences_statements() $$,
     ARRAY[
-        'CREATE SEQUENCE sch1.seq1 INCREMENT 1 MINVALUE 1 MAXVALUE 100 START 2 CACHE 10 NO CYCLE'
+        'CREATE SEQUENCE sch1.seq1 INCREMENT 1 MINVALUE 1 MAXVALUE 100 START 2 CACHE 10 NO CYCLE',
+        'CREATE SEQUENCE sch1.seq2 INCREMENT 10 MINVALUE 1 MAXVALUE 100 START 20 CACHE 1 NO CYCLE'
     ],
     'Statements for sequence creation should be correct'
 );
@@ -52,7 +53,7 @@ FROM (
 
 SELECT sequences_are(
     'sch1',
-    ARRAY['seq1']
+    ARRAY['seq1', 'seq2']
 );
 
 SELECT is(
