summaryrefslogtreecommitdiffstats
path: root/back/odiparback/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'back/odiparback/src/main')
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java6
-rw-r--r--back/odiparback/src/main/resources/application.properties9
2 files changed, 10 insertions, 5 deletions
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
index c1967b5..7a17ded 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
@@ -23,8 +23,10 @@ public class AlmacenDaoImp implements AlmacenDao {
public List<Almacen> getAll() {
List<Almacen> resultado = null;
try{
- String query = "SELECT * FROM almacen";
- resultado = entityManager.createQuery(query).getResultList();
+ String hql = "FROM almacen ";
+ resultado = entityManager.createQuery(hql).getResultList();
+// String query = "SELECT * FROM almacen";
+// resultado = entityManager.createQuery(query).getResultList();
}
catch(Exception ex){
System.out.print(ex.getMessage());
diff --git a/back/odiparback/src/main/resources/application.properties b/back/odiparback/src/main/resources/application.properties
index bdbd503..6c4feb8 100644
--- a/back/odiparback/src/main/resources/application.properties
+++ b/back/odiparback/src/main/resources/application.properties
@@ -1,4 +1,7 @@
-spring.datasource.url=jdbc:mysql://tokumori.xyz:3306/
-spring.datasource.dbname=odiparback
+# MySQL
+spring.datasource.url=jdbc:mysql://tokumori.xyz:3306/odiparback
spring.datasource.username=gabs
-spring.datasource.password=odiparfront
+spring.datasource.password=odiparfront123odiparfront123odiparfront123
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+# com.mysql.cj.jdbc.Driver (new driver) \ No newline at end of file