File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2296,6 +2296,8 @@ function TDBConnection.GetDatatypeByName(var DataType: String; DeleteFromSource:
22962296 rx := TRegExpr.Create;
22972297 rx.ModifierI := True;
22982298 MatchLen := 0 ;
2299+ // Remove quotes around PG enums: "UserStatus"
2300+ DataType := DeQuoteIdent(DataType);
22992301 for i:=0 to High(FDatatypes) do begin
23002302 Types := FDatatypes[i].Name ;
23012303 if FDatatypes[i].Names <> ' ' then begin
@@ -2307,7 +2309,7 @@ function TDBConnection.GetDatatypeByName(var DataType: String; DeleteFromSource:
23072309 TypesSorted.Free;
23082310 end ;
23092311
2310- rx.Expression := ' \b (' +Types+' )\b(\[\])?' ;
2312+ rx.Expression := ' ^ (' +Types+' )\b(\[\])?' ;
23112313 Match := rx.Exec(DataType);
23122314 // Prefer a later match which is longer than the one found before.
23132315 // See http://www.heidisql.com/forum.php?t=17061
You can’t perform that action at this time.
0 commit comments