forked from Limework/skript-db
		
	Revert minimizeJar due to bug & fix sync queries in non-main thread
This commit is contained in:
		
							parent
							
								
									a97ba3aee8
								
							
						
					
					
						commit
						dbce1d33f9
					
				
							
								
								
									
										7
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								pom.xml
									
									
									
									
									
								
							| @ -6,7 +6,7 @@ | |||||||
| 
 | 
 | ||||||
|     <groupId>com.btk5h</groupId> |     <groupId>com.btk5h</groupId> | ||||||
|     <artifactId>skript-db</artifactId> |     <artifactId>skript-db</artifactId> | ||||||
|     <version>1.3.5</version> |     <version>1.3.7</version> | ||||||
|     <packaging>jar</packaging> |     <packaging>jar</packaging> | ||||||
| 
 | 
 | ||||||
|     <repositories> |     <repositories> | ||||||
| @ -19,8 +19,8 @@ | |||||||
|             <url>https://jitpack.io</url> |             <url>https://jitpack.io</url> | ||||||
|         </repository> |         </repository> | ||||||
|         <repository> |         <repository> | ||||||
|             <id>commons-pool2</id> |             <id>mvnrepository</id> | ||||||
|             <url>https://mvnrepository.com/artifact/org.apache.commons/commons-pool2</url> |             <url>https://mvnrepository.com</url> | ||||||
|         </repository> |         </repository> | ||||||
|         <repository> |         <repository> | ||||||
|             <id>PaperMC</id> |             <id>PaperMC</id> | ||||||
| @ -56,7 +56,6 @@ | |||||||
|                 <version>3.2.3</version> |                 <version>3.2.3</version> | ||||||
|                 <configuration> |                 <configuration> | ||||||
|                     <createDependencyReducedPom>false</createDependencyReducedPom> |                     <createDependencyReducedPom>false</createDependencyReducedPom> | ||||||
|                     <minimizeJar>true</minimizeJar> |  | ||||||
|                 </configuration> |                 </configuration> | ||||||
|                 <executions> |                 <executions> | ||||||
|                     <execution> |                     <execution> | ||||||
|  | |||||||
| @ -90,38 +90,31 @@ public class EffExecuteStatement extends Effect { | |||||||
|         Object locals = Variables.removeLocals(e); |         Object locals = Variables.removeLocals(e); | ||||||
| 
 | 
 | ||||||
|         //execute SQL statement |         //execute SQL statement | ||||||
|         CompletableFuture<Object> sql = | 
 | ||||||
|                 CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool); |         CompletableFuture<Object> sql = null; | ||||||
|  |         Object resources = null; | ||||||
|  |         if (!sync) { | ||||||
|  |             sql = CompletableFuture.supplyAsync(() -> executeStatement(ds, baseVariable, query), threadPool); | ||||||
|  |         } else { | ||||||
|  |             resources = executeStatement(ds, baseVariable, query); | ||||||
|  |         } | ||||||
| 
 | 
 | ||||||
|         //when SQL statement is completed |         //when SQL statement is completed | ||||||
|         boolean finalSync = sync; |         boolean finalSync = sync; | ||||||
|  |         if (sql != null) { | ||||||
|             sql.whenComplete((res, err) -> { |             sql.whenComplete((res, err) -> { | ||||||
|                 if (err != null) { |                 if (err != null) { | ||||||
|                     err.printStackTrace(); |                     err.printStackTrace(); | ||||||
|                 } |                 } | ||||||
| 
 |  | ||||||
|                 //handle last error syntax data |                 //handle last error syntax data | ||||||
|                 lastError = null; |                 lastError = null; | ||||||
|                 if (res instanceof String) { |                 if (res instanceof String) { | ||||||
|                     lastError = (String) res; |                     lastError = (String) res; | ||||||
|                 } |                 } | ||||||
| 
 |  | ||||||
|                 if (getNext() != null) { |                 if (getNext() != null) { | ||||||
|                     //if local variables are present |                     //if local variables are present | ||||||
|                     //bring back local variables |                     //bring back local variables | ||||||
| 
 |  | ||||||
|                     //populate SQL data into variables |                     //populate SQL data into variables | ||||||
|                 if (!(res instanceof String)) { |  | ||||||
| 
 |  | ||||||
|                     //also set variables in the sql query complete event |  | ||||||
| 
 |  | ||||||
|                     //TEMPORARILY DISABLED, AS THIS WOULD WORSEN PERFORMANCE OF THE QUERIES AND NOT BE USED BY MOST PEOPLE. |  | ||||||
|                     //I may add config option to enable this later? |  | ||||||
| 
 |  | ||||||
|                     //SQLQueryCompleteEvent event = new SQLQueryCompleteEvent(this.query.getSingle(e)); |  | ||||||
|                     //((Map<String, Object>) res).forEach((name, value) -> setVariable(event, name, value)); |  | ||||||
|                     //SkriptDB.getPlugin(SkriptDB.class).getServer().getPluginManager().callEvent(event); |  | ||||||
|                 } |  | ||||||
|                     if (isSync || finalSync) { |                     if (isSync || finalSync) { | ||||||
|                         if (locals != null) { |                         if (locals != null) { | ||||||
|                             Variables.setLocalVariables(e, locals); |                             Variables.setLocalVariables(e, locals); | ||||||
| @ -148,6 +141,27 @@ public class EffExecuteStatement extends Effect { | |||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|             }); |             }); | ||||||
|  |         // sync executed SQL query, same as above, just sync | ||||||
|  |         } else { | ||||||
|  |             //handle last error syntax data | ||||||
|  |             lastError = null; | ||||||
|  |             if (resources instanceof String) { | ||||||
|  |                 lastError = (String) resources; | ||||||
|  |             } | ||||||
|  |             if (getNext() != null) { | ||||||
|  |                 //if local variables are present | ||||||
|  |                 //bring back local variables | ||||||
|  |                 //populate SQL data into variables | ||||||
|  |                 if (locals != null) { | ||||||
|  |                     Variables.setLocalVariables(e, locals); | ||||||
|  |                 } | ||||||
|  |                 if (!(resources instanceof String)) { | ||||||
|  |                     ((Map<String, Object>) resources).forEach((name, value) -> setVariable(e, name, value)); | ||||||
|  |                 } | ||||||
|  |                 TriggerItem.walk(getNext(), e); | ||||||
|  |                 Variables.removeLocals(e); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     @Override |     @Override | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user