diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9f1c0ee..c534b53d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Added support for passing more than one id in the `Hook.Unbind` method for consistency with the router.
 
+- Fixed `--dev` log query print formatting.
 
 
 ## v0.23.1
diff --git a/core/base.go b/core/base.go
index 14a11243..982c707b 100644
--- a/core/base.go
+++ b/core/base.go
@@ -1138,8 +1138,8 @@ var sqlLogReplacements = map[string]string{
 	"]]":    "`",
 	"<nil>": "NULL",
 }
-var sqlLogPrefixedTableIdentifierPattern = regexp.MustCompile(`\[\[(.+)\.(.+)\]\]`)
-var sqlLogPrefixedColumnIdentifierPattern = regexp.MustCompile(`\{\{(.+)\.(.+)\}\}`)
+var sqlLogPrefixedTableIdentifierPattern = regexp.MustCompile(`\[\[([^\[\]\{\}\.]+)\.([^\[\]\{\}\.]+)\]\]`)
+var sqlLogPrefixedColumnIdentifierPattern = regexp.MustCompile(`\{\{([^\[\]\{\}\.]+)\.([^\[\]\{\}\.]+)\}\}`)
 
 // normalizeSQLLog replaces common query builder charactes with their plain SQL version for easier debugging.
 // The query is still not suitable for execution and should be used only for log and debug purposes