diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
index c4c92edda..65fa36cf0 100644
--- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json
@@ -8,7 +8,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 387,
+      "width": 523,
       "height": 108,
       "opacity": 1,
       "strokeDash": 0,
@@ -57,10 +57,10 @@
       "id": "table_constrained",
       "type": "sql_table",
       "pos": {
-        "x": 447,
+        "x": 583,
         "y": 0
       },
-      "width": 486,
+      "width": 593,
       "height": 108,
       "opacity": 1,
       "strokeDash": 0,
diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg
index 5e016ed19..d53b330bd 100644
--- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg
@@ -2,7 +2,7 @@
 <svg
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="1133" height="308" viewBox="-100 -100 1133 308"><style type="text/css">
+width="1376" height="308" viewBox="-100 -100 1376 308"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -18,16 +18,16 @@ width="1133" height="308" viewBox="-100 -100 1133 308"><style type="text/css">
 }
 
 ]]>
-</style><g id="table"><g class="shape" ><rect class="shape" x="0" y="0" width="387" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="0.000000" y="0.000000" width="387.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="20.000000" y="27.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_overflow</text><text class="text" x="10.000000" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
+</style><g id="table"><g class="shape" ><rect class="shape" x="0" y="0" width="523" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="0.000000" y="0.000000" width="523.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="20.000000" y="27.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_overflow</text><text class="text" x="10.000000" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
 <text class="text" x="265.555556" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">loooooooooooooooooooong</text>
-<text class="text" x="367.000000" y="59.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="0.000000" y1="72.000000" x2="387.000000" y2="72.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="10.000000" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
+<text class="text" x="503.000000" y="59.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="0.000000" y1="72.000000" x2="523.000000" y2="72.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="10.000000" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
 <text class="text" x="265.555556" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">short</text>
-<text class="text" x="367.000000" y="95.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="0.000000" y1="108.000000" x2="387.000000" y2="108.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><g id="table_constrained"><g class="shape" ><rect class="shape" x="447" y="0" width="486" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="447.000000" y="0.000000" width="486.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="467.000000" y="27.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_constrained_overflow</text><text class="text" x="457.000000" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
-<text class="text" x="712.555556" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">loooooooooooooooooooong</text>
-<text class="text" x="913.000000" y="59.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">UNQ</text><line x1="447.000000" y1="72.000000" x2="933.000000" y2="72.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="457.000000" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
-<text class="text" x="712.555556" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">short</text>
-<text class="text" x="913.000000" y="95.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">FK</text><line x1="447.000000" y1="108.000000" x2="933.000000" y2="108.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><mask id="1578507101" maskUnits="userSpaceOnUse" x="0" y="0" width="1133" height="308">
-<rect x="0" y="0" width="1133" height="308" fill="white"></rect>
+<text class="text" x="503.000000" y="95.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="0.000000" y1="108.000000" x2="523.000000" y2="108.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><g id="table_constrained"><g class="shape" ><rect class="shape" x="583" y="0" width="593" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="583.000000" y="0.000000" width="593.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="603.000000" y="27.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_constrained_overflow</text><text class="text" x="593.000000" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
+<text class="text" x="848.555556" y="59.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">loooooooooooooooooooong</text>
+<text class="text" x="1156.000000" y="59.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">UNQ</text><line x1="583.000000" y1="72.000000" x2="1176.000000" y2="72.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="593.000000" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
+<text class="text" x="848.555556" y="95.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">short</text>
+<text class="text" x="1156.000000" y="95.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">FK</text><line x1="583.000000" y1="108.000000" x2="1176.000000" y2="108.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><mask id="3346914773" maskUnits="userSpaceOnUse" x="0" y="0" width="1376" height="308">
+<rect x="0" y="0" width="1376" height="308" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text {
diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
index d97bf998a..8699edbb9 100644
--- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
+++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json
@@ -8,7 +8,7 @@
         "x": 12,
         "y": 12
       },
-      "width": 387,
+      "width": 523,
       "height": 108,
       "opacity": 1,
       "strokeDash": 0,
@@ -57,10 +57,10 @@
       "id": "table_constrained",
       "type": "sql_table",
       "pos": {
-        "x": 419,
+        "x": 556,
         "y": 12
       },
-      "width": 486,
+      "width": 593,
       "height": 108,
       "opacity": 1,
       "strokeDash": 0,
diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg
index 1bb059b9e..5a36d7ce2 100644
--- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg
@@ -2,7 +2,7 @@
 <svg
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="1093" height="308" viewBox="-88 -88 1093 308"><style type="text/css">
+width="1337" height="308" viewBox="-88 -88 1337 308"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -18,16 +18,16 @@ width="1093" height="308" viewBox="-88 -88 1093 308"><style type="text/css">
 }
 
 ]]>
-</style><g id="table"><g class="shape" ><rect class="shape" x="12" y="12" width="387" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="12.000000" y="12.000000" width="387.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="32.000000" y="39.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_overflow</text><text class="text" x="22.000000" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
+</style><g id="table"><g class="shape" ><rect class="shape" x="12" y="12" width="523" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="12.000000" y="12.000000" width="523.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="32.000000" y="39.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_overflow</text><text class="text" x="22.000000" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
 <text class="text" x="277.555556" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">loooooooooooooooooooong</text>
-<text class="text" x="379.000000" y="71.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="12.000000" y1="84.000000" x2="399.000000" y2="84.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="22.000000" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
+<text class="text" x="515.000000" y="71.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="12.000000" y1="84.000000" x2="535.000000" y2="84.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="22.000000" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
 <text class="text" x="277.555556" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">short</text>
-<text class="text" x="379.000000" y="107.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="12.000000" y1="120.000000" x2="399.000000" y2="120.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><g id="table_constrained"><g class="shape" ><rect class="shape" x="419" y="12" width="486" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="419.000000" y="12.000000" width="486.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="439.000000" y="39.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_constrained_overflow</text><text class="text" x="429.000000" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
-<text class="text" x="684.555556" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">loooooooooooooooooooong</text>
-<text class="text" x="885.000000" y="71.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">UNQ</text><line x1="419.000000" y1="84.000000" x2="905.000000" y2="84.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="429.000000" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
-<text class="text" x="684.555556" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">short</text>
-<text class="text" x="885.000000" y="107.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">FK</text><line x1="419.000000" y1="120.000000" x2="905.000000" y2="120.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><mask id="4024135859" maskUnits="userSpaceOnUse" x="0" y="0" width="1093" height="308">
-<rect x="0" y="0" width="1093" height="308" fill="white"></rect>
+<text class="text" x="515.000000" y="107.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;"></text><line x1="12.000000" y1="120.000000" x2="535.000000" y2="120.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><g id="table_constrained"><g class="shape" ><rect class="shape" x="556" y="12" width="593" height="108" style="fill:#FFFFFF;stroke:#0A0F25;opacity:1.000000;stroke-width:2;"/><rect class="class_header" x="556.000000" y="12.000000" width="593.000000" height="36.000000" fill="#0a0f25" /><text class="text" x="576.000000" y="39.000000" style="text-anchor:start;font-size:24px;fill:white">sql_table_constrained_overflow</text><text class="text" x="566.000000" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">short</text>
+<text class="text" x="821.555556" y="71.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">loooooooooooooooooooong</text>
+<text class="text" x="1129.000000" y="71.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">UNQ</text><line x1="556.000000" y1="84.000000" x2="1149.000000" y2="84.000000" style="stroke-width:2;stroke:#0a0f25" /><text class="text" x="566.000000" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(13, 50, 178)">loooooooooooooooooooong</text>
+<text class="text" x="821.555556" y="107.000000" style="text-anchor:start;font-size:20px;fill:rgb(103, 108, 126)">short</text>
+<text class="text" x="1129.000000" y="107.000000" style="text-anchor:end;font-size:20px;fill:rgb(74, 111, 243);letter-spacing:2px;">FK</text><line x1="556.000000" y1="120.000000" x2="1149.000000" y2="120.000000" style="stroke-width:2;stroke:#0a0f25" /></g></g><mask id="2039554718" maskUnits="userSpaceOnUse" x="0" y="0" width="1337" height="308">
+<rect x="0" y="0" width="1337" height="308" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text {