aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/resources')
-rwxr-xr-xsrc/main/resources/applicationContext.xml22
-rw-r--r--src/main/resources/create-postgresql.sql (renamed from src/main/resources/create.sql)6
2 files changed, 3 insertions, 25 deletions
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
deleted file mode 100755
index 2d33d8c..0000000
--- a/src/main/resources/applicationContext.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:jdbc="http://www.springframework.org/schema/jdbc"
- xmlns:jee="http://www.springframework.org/schema/jee"
- xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:jpa="http://www.springframework.org/schema/data/jpa"
- xsi:schemaLocation="
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
- http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
- http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
-
- <context:annotation-config/>
- <bean class="io.trygvis.spring.Config"/>
-
-</beans>
diff --git a/src/main/resources/create.sql b/src/main/resources/create-postgresql.sql
index f7f2939..39672f0 100644
--- a/src/main/resources/create.sql
+++ b/src/main/resources/create-postgresql.sql
@@ -2,7 +2,7 @@ BEGIN;
DROP TABLE IF EXISTS task;
DROP TABLE IF EXISTS queue;
-DROP SEQUENCE IF EXISTS task_id;
+DROP SEQUENCE IF EXISTS task_seq;
CREATE TABLE queue (
name VARCHAR(100) NOT NULL,
@@ -12,7 +12,7 @@ CREATE TABLE queue (
CREATE TABLE task (
id BIGINT NOT NULL,
- parent BIGINT NOT NULL,
+ parent BIGINT,
queue VARCHAR(100) NOT NULL,
scheduled TIMESTAMP NOT NULL,
last_run TIMESTAMP,
@@ -24,6 +24,6 @@ CREATE TABLE task (
CONSTRAINT fk_task__parent FOREIGN KEY (parent) REFERENCES task (id)
);
-CREATE SEQUENCE task_id;
+CREATE SEQUENCE task_seq;
COMMIT;