Merge pull request #13532 from niden/T13529-shared-lock-bug

[#13529] - Moved the sharedLock in the dialects. PostgreSql and Sqlit…
phalcon · Oct 18, 2018 · a225614 · a225614
2 parents 28886f3 + f5c70c2
commit a225614
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 13 deletions.
diff --git a/phalcon/db/dialect.zep b/phalcon/db/dialect.zep
@@ -145,19 +145,6 @@ abstract class Dialect implements DialectInterface
 		return sqlQuery . " FOR UPDATE";
 	}
 
-	/**
-	 * Returns a SQL modified with a LOCK IN SHARE MODE clause
-	 *
-	 *<code>
-	 * $sql = $dialect->sharedLock("SELECT * FROM robots");
-	 * echo $sql; // SELECT * FROM robots LOCK IN SHARE MODE
-	 *</code>
-	 */
-	public function sharedLock(string! sqlQuery) -> string
-	{
-		return sqlQuery . " LOCK IN SHARE MODE";
-	}
-
 	/**
 	 * Gets a list of columns with escaped identifiers
 	 *

diff --git a/phalcon/db/dialect/mysql.zep b/phalcon/db/dialect/mysql.zep
@@ -752,4 +752,17 @@ class Mysql extends Dialect
 
 		return sql;
 	}
+
+	/**
+	 * Returns a SQL modified with a LOCK IN SHARE MODE clause
+	 *
+	 *<code>
+	 * $sql = $dialect->sharedLock("SELECT * FROM robots");
+	 * echo $sql; // SELECT * FROM robots LOCK IN SHARE MODE
+	 *</code>
+	 */
+	public function sharedLock(string! sqlQuery) -> string
+	{
+		return sqlQuery . " LOCK IN SHARE MODE";
+	}
 }
diff --git a/phalcon/db/dialect/postgresql.zep b/phalcon/db/dialect/postgresql.zep
@@ -678,4 +678,13 @@ class Postgresql extends Dialect
 	{
 		return "";
 	}
+
+	/**
+	 * Returns a SQL modified a shared lock statement. For now this method
+	 * returns the original query
+	 */
+	public function sharedLock(string! sqlQuery) -> string
+	{
+		return sqlQuery;
+	}
 }
diff --git a/phalcon/db/dialect/sqlite.zep b/phalcon/db/dialect/sqlite.zep
@@ -598,4 +598,13 @@ class Sqlite extends Dialect
 	{
 		return "";
 	}
+
+	/**
+	 * Returns a SQL modified a shared lock statement. For now this method
+	 * returns the original query
+	 */
+	public function sharedLock(string! sqlQuery) -> string
+	{
+		return sqlQuery;
+	}
 }