Fix pruneTemporaryKeys for PostgreSql

cdujeu · cdujeu · commit 501640db908b · 2015-03-30T15:49:43.000+02:00
diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php
@@ -1036,7 +1036,11 @@ public function deleteTemporaryKey($keyType, $keyId)
      */
     public function pruneTemporaryKeys($keyType, $expiration)
     {
-        dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - %i)", "temporakey_".$keyType, $expiration*60);
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - time '0:$expiration')", "temporakey_".$keyType);
+        }else{
+            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - %i)", "temporakey_".$keyType, $expiration*60);
+        }
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1036,7 +1036,11 @@ public function deleteTemporaryKey($keyType, $keyId)`
`1036`	`1036`	`*/`
`1037`	`1037`	`public function pruneTemporaryKeys($keyType, $expiration)`
`1038`	`1038`	`{`
`1039`		`- dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - %i)", "temporakey_".$keyType, $expiration*60);`
	`1039`	`+ if($this->sqlDriver["driver"] == "postgre"){`
	`1040`	`+ dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - time '0:$expiration')", "temporakey_".$keyType);`
	`1041`	`+ }else{`
	`1042`	`+ dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - %i)", "temporakey_".$keyType, $expiration*60);`
	`1043`	`+ }`
`1040`	`1044`	`}`
`1041`	`1045`
`1042`	`1046`