[Registry-dev] svn commit r9990 - in
trunk/registry/modules/core/src:
main/java/org/wso2/registry/jdbc/dao
main/java/org/wso2/registry/jdbc/hsql
test/java/org/wso2/registry/jdbc
svn at wso2.org
svn at wso2.org
Tue Nov 20 21:19:10 PST 2007
Author: chathura
Date: Tue Nov 20 21:19:02 2007
New Revision: 9990
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
Log:
Renamed the TAGGINGS table to TAGS.
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java Tue Nov 20 21:19:02 2007
@@ -33,7 +33,7 @@
public void addTagging(String tagName, long resourceID, String userID, Connection conn) throws SQLException {
- String sql = "INSERT INTO TAGGINGS (TAG_NAME, AID, USER_ID, TAGGED_TIME) VALUES (?,?,?,?)";
+ String sql = "INSERT INTO TAGS (TAG_NAME, AID, USER_ID, TAGGED_TIME) VALUES (?,?,?,?)";
long now = System.currentTimeMillis();
@@ -49,7 +49,7 @@
public boolean taggingExist(String tagName, long resourceID, String userID, Connection conn)
throws SQLException {
- String sql = "SELECT COUNT(TN.TAG_NAME) FROM TAGGINGS TN WHERE TN.TAG_NAME=? AND TN.AID=? AND TN.USER_ID=?";
+ String sql = "SELECT COUNT(TN.TAG_NAME) FROM TAGS TN WHERE TN.TAG_NAME=? AND TN.AID=? AND TN.USER_ID=?";
PreparedStatement s = conn.prepareStatement(sql);
s.setString(1, tagName);
@@ -67,7 +67,7 @@
public void removeTaggings(long resourceID, Connection conn) throws SQLException {
- String sql = "DELETE FROM TAGGINGS WHERE AID=?";
+ String sql = "DELETE FROM TAGS WHERE AID=?";
PreparedStatement s = conn.prepareStatement(sql);
s.setLong(1, resourceID);
@@ -77,7 +77,7 @@
public String[] getPathsWithTag(String tag, Connection conn) throws SQLException {
- String sql = "SELECT A.PATH FROM ARTIFACTS A, TAGGINGS TN, TAGS T WHERE T.TAG_NAME=? AND T.TAG_ID=TN.TAG_ID AND TN.AID=A.AID";
+ String sql = "SELECT A.PATH FROM ARTIFACTS A, TAGS TN, TAGS T WHERE T.TAG_NAME=? AND T.TAG_ID=TN.TAG_ID AND TN.AID=A.AID";
PreparedStatement s = conn.prepareStatement(sql);
s.setString(1, tag);
@@ -93,7 +93,7 @@
public String[] getTags(String path, Connection conn) throws SQLException {
- String sql = "SELECT T.TAG_NAME FROM TAGS T, TAGGINGS TN, ARTIFACTS A WHERE A.PATH=? AND A.AID=TN.AID AND TN.TAG_ID=T.TAG_ID";
+ String sql = "SELECT T.TAG_NAME FROM TAGS T, TAGS TN, ARTIFACTS A WHERE A.PATH=? AND A.AID=TN.AID AND TN.TAG_ID=T.TAG_ID";
PreparedStatement s = conn.prepareStatement(sql);
s.setString(1, path);
@@ -110,7 +110,7 @@
public List getTaggedPaths(String tag, Connection conn) throws SQLException {
//String sql = "SELECT A.PATH, COUNT(T.TAG_ID) FROM ARTIFACTS A, TAGGINGS TN, TAGS T WHERE T.TAG_NAME=? AND T.TAG_ID=TN.TAG_ID AND TN.AID=A.AID GROUP BY A.PATH";
- String sql = "SELECT A.PATH, COUNT(TN.TAG_NAME) FROM ARTIFACTS A, TAGGINGS TN WHERE TN.TAG_NAME=? AND TN.AID=A.AID GROUP BY A.PATH";
+ String sql = "SELECT A.PATH, COUNT(TN.TAG_NAME) FROM ARTIFACTS A, TAGS TN WHERE TN.TAG_NAME=? AND TN.AID=A.AID GROUP BY A.PATH";
PreparedStatement s = conn.prepareStatement(sql);
s.setString(1, tag);
@@ -130,7 +130,7 @@
public Tag[] getTagsWithCount(String path, Connection conn) throws SQLException {
//String sql = "SELECT T.TAG_NAME, COUNT(A.AID) FROM TAGS T, TAGGINGS TN, ARTIFACTS A WHERE A.PATH=? AND A.AID=TN.AID AND TN.TAG_ID=T.TAG_ID GROUP BY T.TAG_NAME";
- String sql = "SELECT TN.TAG_NAME, COUNT(A.AID) FROM TAGGINGS TN, ARTIFACTS A WHERE A.PATH=? AND A.AID=TN.AID GROUP BY TN.TAG_NAME";
+ String sql = "SELECT TN.TAG_NAME, COUNT(A.AID) FROM TAGS TN, ARTIFACTS A WHERE A.PATH=? AND A.AID=TN.AID GROUP BY TN.TAG_NAME";
PreparedStatement s = conn.prepareStatement(sql);
s.setString(1, path);
@@ -153,7 +153,7 @@
ResourceDAO resourceDAO = new ResourceDAO();
long aid = resourceDAO.getArtifactID(path, conn);
- String sql = "SELECT T.TAGGED_TIME FROM TAGGINGS T, ARTIFACTS A WHERE A.AID=T.AID AND T.AID=? AND T.USER_ID=? AND T.TAG_NAME=?";
+ String sql = "SELECT T.TAGGED_TIME FROM TAGS T, ARTIFACTS A WHERE A.AID=T.AID AND T.AID=? AND T.USER_ID=? AND T.TAG_NAME=?";
PreparedStatement s = conn.prepareStatement(sql);
s.setLong(1, aid);
@@ -182,7 +182,7 @@
public TaggingDO getTagging(long taggingID, Connection conn)
throws SQLException {
- String sql = "SELECT A.AID, A.PATH, T.USER_ID, T.TAG_NAME, T.TAGGED_TIME FROM TAGGINGS T, ARTIFACTS A WHERE A.AID=T.AID AND T.TN_ID=?";
+ String sql = "SELECT A.AID, A.PATH, T.USER_ID, T.TAG_NAME, T.TAGGED_TIME FROM TAGS T, ARTIFACTS A WHERE A.AID=T.AID AND T.TN_ID=?";
PreparedStatement s = conn.prepareStatement(sql);
s.setLong(1, taggingID);
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java Tue Nov 20 21:19:02 2007
@@ -55,12 +55,7 @@
"FOREIGN KEY (PARENT_ID) REFERENCES ARTIFACTS (AID)," +
"FOREIGN KEY (CHILD_ID) REFERENCES ARTIFACTS (AID))";
- private static final String tagsTable = "CREATE TABLE TAGS (TAG_ID INTEGER GENERATED BY DEFAULT AS IDENTITY," +
- "TAG_NAME VARCHAR (500) NOT NULL," +
- "PRIMARY KEY (TAG_ID)," +
- "UNIQUE (TAG_NAME))";
-
- private static final String taggingsTable = "CREATE TABLE TAGGINGS (TN_ID INTEGER GENERATED BY DEFAULT AS IDENTITY," +
+ private static final String tagsTable = "CREATE TABLE TAGS (TN_ID INTEGER GENERATED BY DEFAULT AS IDENTITY," +
"TAG_NAME VARCHAR (500) NOT NULL," +
"AID INTEGER NOT NULL," +
"USER_ID VARCHAR (20) NOT NULL," +
@@ -118,7 +113,7 @@
s.executeUpdate(propertiesTable);
s.executeUpdate(childrenTable);
//s.executeUpdate(tagsTable);
- s.executeUpdate(taggingsTable);
+ s.executeUpdate(tagsTable);
s.executeUpdate(commentsTable);
s.executeUpdate(ratingsTable);
s.executeUpdate(logsTable);
Modified: trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
==============================================================================
--- trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java (original)
+++ trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java Tue Nov 20 21:19:02 2007
@@ -699,7 +699,7 @@
registry.applyTag("/c3/r2", "jsp");
registry.applyTag("/c3/r3", "ajax");
- String sql1 = "SELECT T.TN_ID FROM TAGGINGS T, ARTIFACTS A WHERE A.AID=T.AID AND A.DESCRIPTION LIKE ?";
+ String sql1 = "SELECT T.TN_ID FROM TAGS T, ARTIFACTS A WHERE A.AID=T.AID AND A.DESCRIPTION LIKE ?";
Resource q1 = new Resource();
q1.setContent(sql1);
q1.setMediaType(RegistryConstants.SQL_QUERY_MEDIA_TYPE);
More information about the Registry-dev
mailing list