Change 'user' field to 'genie_user' in database to avoid sql keyword …

…confict (#467)
Netflix · Feb 7, 2017 · aba7ab6 · aba7ab6
1 parent 3839537
commit aba7ab6
Show file tree

Hide file tree

Showing 11 changed files with 989 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ git:
 install: true
 before_script:
 - mysql -u root -e 'create database genie;'
-- mysql -u root genie < genie-ddl/src/main/sql/mysql/3.0.0-schema.mysql.sql
+- mysql -u root genie < genie-ddl/src/main/sql/mysql/3.0.1-schema.mysql.sql
 script: ./gradle/buildViaTravis.sh
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

diff --git a/genie-core/src/main/java/com/netflix/genie/core/jpa/entities/CommonFieldsEntity.java b/genie-core/src/main/java/com/netflix/genie/core/jpa/entities/CommonFieldsEntity.java
@@ -62,7 +62,7 @@ public class CommonFieldsEntity extends BaseEntity {
     private String version;
 
     @Basic(optional = false)
-    @Column(name = "user", nullable = false)
+    @Column(name = "genie_user", nullable = false)
     @NotBlank(message = "User name is missing and is required.")
     @Size(max = 255, message = "Max length in database is 255 characters")
     private String user;

diff --git a/...es/com/netflix/genie/core/jpa/services/JpaApplicationServiceImplIntegrationTests/init.xml b/...es/com/netflix/genie/core/jpa/services/JpaApplicationServiceImplIntegrationTests/init.xml
@@ -19,7 +19,7 @@
         id="app1"
         created="2014-08-08 01:45:00"
         updated="2014-08-08 01:50:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="tez"
         version="1.2.3"
         status="INACTIVE"
@@ -43,7 +43,7 @@
         id="app2"
         created="2014-08-09 01:45:00"
         updated="2014-08-09 01:50:00"
-        user="amsharma"
+        genie_user="amsharma"
         name="spark"
         version="4.5.6"
         status="ACTIVE"
@@ -65,7 +65,7 @@
         id="app3"
         created="2014-08-10 01:45:00"
         updated="2014-08-10 01:50:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="storm"
         version="7.8.9"
         status="DEPRECATED"
@@ -87,7 +87,7 @@
         id="command1"
         created="2014-08-08 01:47:00"
         updated="2014-08-08 01:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="pig_13_prod"
         version="1.2.3"
         executable="pig"

diff --git a/...ources/com/netflix/genie/core/jpa/services/JpaClusterServiceImplIntegrationTests/init.xml b/...ources/com/netflix/genie/core/jpa/services/JpaClusterServiceImplIntegrationTests/init.xml
@@ -19,7 +19,7 @@
         id="command1"
         created="2014-08-08 01:47:00"
         updated="2014-08-08 01:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="pig_13_prod"
         version="1.2.3"
         executable="pig"
@@ -39,7 +39,7 @@
         id="command2"
         created="2014-08-08 01:46:00"
         updated="2014-08-08 03:12:00"
-        user="amsharma"
+        genie_user="amsharma"
         name="hive_11_prod"
         version="4.5.6"
         executable="hive"
@@ -56,7 +56,7 @@
         id="command3"
         created="2014-08-08 01:49:00"
         updated="2014-08-08 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="pig_11_prod"
         version="7.8.9"
         executable="pig"
@@ -73,7 +73,7 @@
         id="cluster1"
         created="2014-07-08 01:49:00"
         updated="2014-07-08 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="h2prod"
         version="2.4.0"
         status="UP"
@@ -101,7 +101,7 @@
         id="cluster2"
         created="2014-07-09 01:49:00"
         updated="2014-07-09 02:59:00"
-        user="amsharma"
+        genie_user="amsharma"
         name="h2query"
         version="2.4.0"
         status="UP"
@@ -132,7 +132,7 @@
         id="job1"
         created="2015-08-11 01:48:00"
         updated="2014-08-11 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testPigJob"
         version="2.4"
         command_args="-f query.pig"
@@ -152,7 +152,7 @@
         id="job1"
         created="2015-08-11 01:49:00"
         updated="2014-08-11 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testPigJob"
         command_args="-f query.pig"
         status="SUCCEEDED"
@@ -163,7 +163,7 @@
         id="job2"
         created="2015-08-12 01:48:00"
         updated="2014-08-12 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob"
         version="2.4"
         command_args="-f spark.jar"
@@ -183,7 +183,7 @@
         id="job2"
         created="2015-08-12 01:49:00"
         updated="2014-08-12 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob"
         command_args="-f spark.jar"
         status="RUNNING"

diff --git a/...ources/com/netflix/genie/core/jpa/services/JpaCommandServiceImplIntegrationTests/init.xml b/...ources/com/netflix/genie/core/jpa/services/JpaCommandServiceImplIntegrationTests/init.xml
@@ -19,7 +19,7 @@
             id="app1"
             created="2014-08-08 01:45:00"
             updated="2014-08-08 01:50:00"
-            user="tgianos"
+            genie_user="tgianos"
             name="tez"
             version="1.2.3"
             status="ACTIVE"
@@ -43,7 +43,7 @@
             id="command1"
             created="2014-08-08 01:47:00"
             updated="2014-08-08 01:59:00"
-            user="tgianos"
+            genie_user="tgianos"
             name="pig_13_prod"
             version="1.2.3"
             executable="pig"
@@ -63,7 +63,7 @@
             id="command2"
             created="2014-08-08 01:46:00"
             updated="2014-08-08 03:12:00"
-            user="amsharma"
+            genie_user="amsharma"
             name="hive_11_prod"
             version="4.5.6"
             executable="hive"
@@ -80,7 +80,7 @@
             id="command3"
             created="2014-08-08 01:49:00"
             updated="2014-08-08 02:59:00"
-            user="tgianos"
+            genie_user="tgianos"
             name="pig_11_prod"
             version="7.8.9"
             executable="pig"
@@ -97,7 +97,7 @@
             id="cluster1"
             created="2014-07-08 01:49:00"
             updated="2014-07-08 02:59:00"
-            user="tgianos"
+            genie_user="tgianos"
             name="h2prod"
             version="2.4.0"
             status="UP"

diff --git a/...com/netflix/genie/core/jpa/services/JpaJobPersistenceServiceImplIntegrationTests/init.xml b/...com/netflix/genie/core/jpa/services/JpaJobPersistenceServiceImplIntegrationTests/init.xml
@@ -20,7 +20,7 @@
         id="app1"
         created="2016-03-21 01:35:00"
         updated="2016-03-21 01:40:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="hadoop"
         version="4.5.6"
         status="ACTIVE"
@@ -42,7 +42,7 @@
         id="app2"
         created="2016-03-21 01:45:00"
         updated="2016-03-21 01:50:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="spark"
         version="1.6.0"
         status="ACTIVE"
@@ -64,7 +64,7 @@
         id="app3"
         created="2016-03-21 01:55:00"
         updated="2016-03-21 02:00:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="spark"
         version="2.0.0"
         status="ACTIVE"
@@ -86,7 +86,7 @@
         id="command1"
         created="2016-03-21 01:47:00"
         updated="2016-03-21 01:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="spark"
         version="1.6.0"
         executable="spark"
@@ -103,7 +103,7 @@
         id="cluster1"
         created="2016-03-21 01:49:00"
         updated="2016-03-21 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="h2query"
         version="2.4.0"
         status="UP"
@@ -126,7 +126,7 @@
         id="job1"
         created="2015-08-11 01:48:00"
         updated="2015-08-11 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob"
         version="2.4"
         command_args="-f query.q"
@@ -154,7 +154,7 @@
         id="job1"
         created="2015-08-11 01:49:00"
         updated="2015-08-11 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob"
         command_args="-f query.q"
         status="SUCCEEDED"
@@ -183,7 +183,7 @@
         id="job2"
         created="2015-08-12 01:48:00"
         updated="2015-08-12 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob1"
         version="2.4"
         command_args="-f spark.jar"
@@ -211,7 +211,7 @@
         id="job2"
         created="2015-08-12 01:49:00"
         updated="2015-08-12 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob1"
         command_args="-f spark.jar"
         status="RUNNING"
@@ -240,7 +240,7 @@
         id="job3"
         created="2016-02-24 01:48:00"
         updated="2016-02-24 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob2"
         version="2.4"
         command_args="-f spark.jar"
@@ -268,7 +268,7 @@
         id="job3"
         created="2016-02-24 01:49:00"
         updated="2016-02-24 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob2"
         command_args="-f spark.jar"
         status="RUNNING"

diff --git a/...rces/com/netflix/genie/core/jpa/services/JpaJobSearchServiceImplIntegrationTests/init.xml b/...rces/com/netflix/genie/core/jpa/services/JpaJobSearchServiceImplIntegrationTests/init.xml
@@ -20,7 +20,7 @@
         id="app1"
         created="2016-03-21 01:35:00"
         updated="2016-03-21 01:40:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="hadoop"
         version="4.5.6"
         status="ACTIVE"
@@ -42,7 +42,7 @@
         id="app2"
         created="2016-03-21 01:45:00"
         updated="2016-03-21 01:50:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="spark"
         version="1.6.0"
         status="ACTIVE"
@@ -64,7 +64,7 @@
         id="app3"
         created="2016-03-21 01:55:00"
         updated="2016-03-21 02:00:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="spark"
         version="2.0.0"
         status="ACTIVE"
@@ -86,7 +86,7 @@
         id="command1"
         created="2016-03-21 01:47:00"
         updated="2016-03-21 01:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="spark"
         version="1.6.0"
         executable="spark"
@@ -103,7 +103,7 @@
         id="cluster1"
         created="2016-03-21 01:49:00"
         updated="2016-03-21 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="h2query"
         version="2.4.0"
         status="UP"
@@ -126,7 +126,7 @@
         id="job1"
         created="2015-08-11 01:48:00"
         updated="2014-08-11 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob"
         version="2.4"
         command_args="-f query.q"
@@ -146,7 +146,7 @@
         id="job1"
         created="2015-08-11 01:49:00"
         updated="2014-08-11 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob"
         command_args="-f query.q"
         status="SUCCEEDED"
@@ -175,7 +175,7 @@
         id="job2"
         created="2015-08-12 01:48:00"
         updated="2015-08-12 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob1"
         version="2.4"
         command_args="-f spark.jar"
@@ -195,7 +195,7 @@
         id="job2"
         created="2015-08-12 01:49:00"
         updated="2015-08-12 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob1"
         command_args="-f spark.jar"
         status="INIT"
@@ -224,7 +224,7 @@
         id="job3"
         created="2016-02-24 01:48:00"
         updated="2016-02-24 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob2"
         version="2.4"
         command_args="-f spark.jar"
@@ -244,7 +244,7 @@
         id="job3"
         created="2016-02-24 01:49:00"
         updated="2016-02-24 02:59:00"
-        user="tgianos"
+        genie_user="tgianos"
         name="testSparkJob2"
         command_args="-f spark.jar"
         status="RUNNING"