Author: solomax
Date: Tue Oct 4 14:07:53 2016
New Revision: 1763280
URL: http://svn.apache.org/viewvc?rev=1763280&view=rev
Log:
[OPENMEETINGS-1483] column name is changed to satisfy MS SQL
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1763280&r1=1763279&r2=1763280&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
Tue Oct 4 14:07:53 2016
@@ -61,8 +61,8 @@ public class Configuration implements ID
@Column(name = "id")
@Element(name = "id", data = true)
private Long id;
-
- @Column(name = "key", unique = true)
+
+ @Column(name = "om_key", unique = true)
@Element(name = "key", data = true, required = false)
private String key;
@@ -158,5 +158,4 @@ public class Configuration implements ID
public void setUser(User user) {
this.user = user;
}
-
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1763280&r1=1763279&r2=1763280&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
Tue Oct 4 14:07:53 2016
@@ -61,8 +61,8 @@ public class Configuration implements ID
@Column(name = "id")
@Element(name = "id", data = true)
private Long id;
-
- @Column(name = "key", unique = true)
+
+ @Column(name = "om_key", unique = true)
@Element(name = "key", data = true, required = false)
private String key;
@@ -158,5 +158,4 @@ public class Configuration implements ID
public void setUser(User user) {
this.user = user;
}
-
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1763280&r1=1763279&r2=1763280&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
Tue Oct 4 14:07:53 2016
@@ -61,8 +61,8 @@ public class Configuration implements ID
@Column(name = "id")
@Element(name = "id", data = true)
private Long id;
-
- @Column(name = "key", unique = true)
+
+ @Column(name = "om_key", unique = true)
@Element(name = "key", data = true, required = false)
private String key;
@@ -158,5 +158,4 @@ public class Configuration implements ID
public void setUser(User user) {
this.user = user;
}
-
}
