#14 - Fix name quoting without alias

technicalguru · technicalguru · commit 4cd444ebc081 · 2021-03-12T21:55:18.000+01:00
diff --git a/src/TgDatabase/Impl/CriteriaImpl.php b/src/TgDatabase/Impl/CriteriaImpl.php
@@ -228,8 +228,10 @@ public function quoteName($aliasOrIdentifier, $identifier = NULL) {
 		if ($identifier != NULL) {
 			if (is_array($identifier)) {
 				return $this->database->quoteName($identifier[0]).'.'.$this->database->quoteName($identifier[1]);
+			} else if ($aliasOrIdentifier != NULL) {
+			    return $this->database->quoteName($aliasOrIdentifier).'.'.$this->database->quoteName($identifier);
 			}
-			return $this->database->quoteName($aliasOrIdentifier).'.'.$this->database->quoteName($identifier);
+			return $this->database->quoteName($identifier);
 		}
 		return $this->database->quoteName($aliasOrIdentifier);
 	}

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,10 @@ public function quoteName($aliasOrIdentifier, $identifier = NULL) {`
`228`	`228`	`if ($identifier != NULL) {`
`229`	`229`	`if (is_array($identifier)) {`
`230`	`230`	`return $this->database->quoteName($identifier[0]).'.'.$this->database->quoteName($identifier[1]);`
	`231`	`+ } else if ($aliasOrIdentifier != NULL) {`
	`232`	`+ return $this->database->quoteName($aliasOrIdentifier).'.'.$this->database->quoteName($identifier);`
`231`	`233`	`}`
`232`		`- return $this->database->quoteName($aliasOrIdentifier).'.'.$this->database->quoteName($identifier);`
	`234`	`+ return $this->database->quoteName($identifier);`
`233`	`235`	`}`
`234`	`236`	`return $this->database->quoteName($aliasOrIdentifier);`
`235`	`237`	`}`