A native macOS / windows / Linux database IDE built with Swift and AppKit. Connect to PostgreSQL, MySQL, SQLite, and Redis from a single app with a fast, keyboard-driven interface.
C++
refactor(windows): expose ERDiagramService D2 helpers as public static
DangHuynh0bf3d0ff42ea
diff --git a/windows/Gridex/ERDiagramService.cpp b/windows/Gridex/ERDiagramService.cppindex b2b11c1..f35e27e 100644--- a/windows/Gridex/ERDiagramService.cpp+++ b/windows/Gridex/ERDiagramService.cpp@@ -1,5 +1,6 @@#include <windows.h>#include "Models/ERDiagramService.h"+#include <atomic>#include <fstream>#include <sstream>#include <set>@@ -32,7 +33,7 @@ namespace DBModels}// Replace anything not [A-Za-z0-9_] with '_'. Prefix t_ if starts with digit.- static std::wstring sanitizeIdentifier(const std::wstring& name)+ std::wstring ERDiagramService::SanitizeIdentifier(const std::wstring& name){std::wstring out;out.reserve(name.size());@@ -55,7 +56,7 @@ namespace DBModels// "height", "label". When a SQL column matches one of these, d2 thinks// we're setting an attribute and barfs ("non-integer width 'bigint'").// Wrap the identifier in double quotes to force literal interpretation.- static bool isD2Reserved(const std::wstring& name)+ bool ERDiagramService::IsD2Reserved(const std::wstring& name){// Lowercase compare since SQL is case-insensitive but d2 is notstd::wstring lower;@@ -77,13 +78,36 @@ namespace DBModels}// Quote a column identifier if it collides with a d2 reserved keyword.- static std::wstring quoteIfReserved(const std::wstring& name)+ std::wstring ERDiagramService::QuoteIfReserved(const std::wstring& name){- if (isD2Reserved(name))+ if (IsD2Reserved(name))return L"\"" + name + L"\"";return name;}+ // Escape a string for use as a D2 quoted label. Wraps in "…" and escapes+ // embedded quotes, backslashes, and newlines so labels with pk values+ // like O'Brien, paths, or multi-line text don't break the d2 parser.+ std::wstring ERDiagramService::EscapeD2Label(const std::wstring& text)+ {+ std::wstring out;+ out.reserve(text.size() + 2);+ out += L'"';+ for (wchar_t c : text)+ {+ switch (c)+ {+ case L'"': out += L"\\\""; break;+ case L'\\': out += L"\\\\"; break;+ case L'\n': out += L"\\n"; break;+ case L'\r': break; // strip+ default: out += c; break;+ }+ }+ out += L'"';+ return out;+ }+// Simplify type strings: "varchar(255)" -> "varchar",// "character varying" -> "varchar", strip parens / spaces / casts.static std::wstring simplifyType(const std::wstring& dataType)@@ -145,8 +169,12 @@ namespace DBModelsreturn L"";}- // Build %TEMP%\gridex\<random>.<extension>- static std::wstring tempPath(const std::wstring& extension)+ // Build %TEMP%\gridex\<prefix><tick>_<counter>.<extension>.+ // Counter is a process-wide atomic so concurrent callers (ER diagram ++ // row graph) don't collide on filename. Prefix defaults to "er_" to+ // preserve prior behavior; distinct prefixes namespace filenames.+ std::wstring ERDiagramService::TempPath(const std::wstring& extension,+ const std::wstring& prefix){wchar_t tmp[MAX_PATH] = {};DWORD len = GetTempPathW(MAX_PATH, tmp);@@ -155,16 +183,15 @@ namespace DBModelsstd::wstring dir = std::wstring(tmp) + L"gridex";CreateDirectoryW(dir.c_str(), nullptr);- // Random suffix using GetTickCount + counter- static int counter = 0;- wchar_t name[64];- swprintf_s(name, 64, L"\\er_%lu_%d.%s",- GetTickCount(), counter++, extension.c_str());+ static std::atomic<int> counter{0};+ wchar_t name[96];+ swprintf_s(name, 96, L"\\%ls%lu_%d.%ls",+ prefix.c_str(), GetTickCount(), counter++, extension.c_str());return dir + name;}// Run d2.exe with input/output paths. Returns exit code.- static int runD2(const std::wstring& d2Exe,+ int ERDiagramService::RunD2(const std::wstring& d2Exe,const std::wstring& inputPath, const std::wstring& outputPath,std::wstring& stderrOut){@@ -280,12 +307,12 @@ namespace DBModelstry { cols = adapter->describeTable(tableName, schema); }catch (...) { continue; }- ss << sanitizeIdentifier(tableName) << L": {\n";+ ss << SanitizeIdentifier(tableName) << L": {\n";ss << L" shape: sql_table\n";for (const auto& col : cols){- std::wstring colId = sanitizeIdentifier(col.name);- std::wstring colKey = quoteIfReserved(colId);+ std::wstring colId = SanitizeIdentifier(col.name);+ std::wstring colKey = QuoteIfReserved(colId);std::wstring typeId = simplifyType(col.dataType);ss << L" " << colKey << L": " << typeId;if (col.isPrimaryKey)@@ -314,11 +341,11 @@ namespace DBModels// FK arrow without label — user prefers clean lines.// Quote column identifiers if they collide with d2 keywords.- ss << sanitizeIdentifier(tableName) << L"."- << quoteIfReserved(sanitizeIdentifier(fk.column))+ ss << SanitizeIdentifier(tableName) << L"."+ << QuoteIfReserved(SanitizeIdentifier(fk.column))<< L" -> "- << sanitizeIdentifier(fk.referencedTable) << L"."- << quoteIfReserved(sanitizeIdentifier(fk.referencedColumn))+ << SanitizeIdentifier(fk.referencedTable) << L"."+ << QuoteIfReserved(SanitizeIdentifier(fk.referencedColumn))<< L"\n";relCount++;}@@ -381,8 +408,8 @@ namespace DBModelsreport(L"Using d2.exe at: " + d2Exe);// 3. Write D2 text to temp file (UTF-8)- std::wstring inputPath = tempPath(L"d2");- std::wstring outputPath = tempPath(L"svg");+ std::wstring inputPath = TempPath(L"d2");+ std::wstring outputPath = TempPath(L"svg");if (inputPath.empty() || outputPath.empty()){result.error = L"Cannot create temp files";@@ -403,7 +430,7 @@ namespace DBModels// 4. Run d2.exereport(L"Running d2.exe...");std::wstring stderrOut;- int exitCode = runD2(d2Exe, inputPath, outputPath, stderrOut);+ int exitCode = RunD2(d2Exe, inputPath, outputPath, stderrOut);if (exitCode != 0){diff --git a/windows/Gridex/Models/ERDiagramService.h b/windows/Gridex/Models/ERDiagramService.hindex d5580f8..3995555 100644--- a/windows/Gridex/Models/ERDiagramService.h+++ b/windows/Gridex/Models/ERDiagramService.h@@ -36,5 +36,38 @@ namespace DBModels// Resolve d2.exe path (Package.Current install dir or exe dir)static std::wstring LocateD2Exe();++ // ── Public D2 helpers ──────────────────────────────+ // Shared escape/quote helpers for any caller emitting D2 source.+ // Previously file-scope statics; promoted to public static so other+ // services (e.g. enterprise row-relationship graph) reuse the same+ // rules without copy-paste drift.++ // Replace non-[A-Za-z0-9_] with '_'; prefix "t_" if starts with digit.+ static std::wstring SanitizeIdentifier(const std::wstring& name);++ // True if name collides with a d2 reserved keyword (shape, width, …).+ static bool IsD2Reserved(const std::wstring& name);++ // Wrap in double quotes if reserved, else return unchanged.+ static std::wstring QuoteIfReserved(const std::wstring& name);++ // Wrap text in double quotes and escape ", \, and newlines so it+ // can be used as a D2 string label.+ static std::wstring EscapeD2Label(const std::wstring& text);++ // Build %TEMP%\gridex\<prefix><tick>_<counter>.<extension>.+ // Default prefix "er_" preserves existing behavior; callers that+ // need a disjoint filename namespace pass their own prefix.+ static std::wstring TempPath(const std::wstring& extension,+ const std::wstring& prefix = L"er_");++ // Invoke bundled d2.exe with standard layout/theme/bundle flags.+ // Writes SVG to outputPath; captures stderr into stderrOut.+ // Returns process exit code (-1 on launch failure).+ static int RunD2(const std::wstring& d2ExePath,+ const std::wstring& inputPath,+ const std::wstring& outputPath,+ std::wstring& stderrOut);};}