TEIID-2334, TEIID-1854

Author: rareddy

.gitignore

@@ -5,3 +5,4 @@ target
 bin
 build.xml
 .DS_Store
+m2e-wtp

api/src/main/java/org/teiid/logging/LogConstants.java

@@ -37,6 +37,7 @@ public interface LogConstants {
 	public static final String CTX_ADMIN_API = "org.teiid.ADMIN_API"; //$NON-NLS-1$
 	public static final String CTX_RUNTIME = "org.teiid.RUNTIME"; //$NON-NLS-1$
 	public static final String CTX_ODBC = "org.teiid.ODBC"; //$NON-NLS-1$
+	public static final String CTX_ODATA = "org.teiid.ODATA"; //$NON-NLS-1$
 
 	// Query contexts
 	public static final String CTX_FUNCTION_TREE = CTX_QUERY_PLANNER + ".FUNCTION_TREE"; //$NON-NLS-1$

api/src/main/java/org/teiid/translator/SourceSystemFunctions.java

@@ -63,6 +63,7 @@ public class SourceSystemFunctions {
 	public static final String SUBSTRING = "substring"; //$NON-NLS-1$
 	public static final String TO_BYTES = "to_bytes"; //$NON-NLS-1$
 	public static final String TO_CHARS = "to_chars"; //$NON-NLS-1$
+	public static final String ENDSWITH = "endswith"; //$NON-NLS-1$
 	/**
 	 * The trim function is only used for a non-space trim character
 	 */

build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml

@@ -312,7 +312,6 @@
             <translator name="intersystems-cache" module="org.jboss.teiid.translator.jdbc"/>
             <translator name="netezza" module="org.jboss.teiid.translator.jdbc"/>
             <translator name="file" module="org.jboss.teiid.translator.file"/>
-            <translator name="google-spreadsheet" module="org.jboss.teiid.translator.google"/>
             <translator name="ldap" module="org.jboss.teiid.translator.ldap"/>
             <translator name="loopback" module="org.jboss.teiid.translator.loopback"/>
             <translator name="olap" module="org.jboss.teiid.translator.olap"/>

engine/src/main/java/org/teiid/query/function/FunctionMethods.java

@@ -714,6 +714,15 @@ public static Object upperCase(String str) {
 	public static Object locate(String sub, String str) {
 		return locate(sub, str, 1);
 	}
+	
+	// ================== Function = endsWith =====================
+
+	public static Object endsWith(String sub, String str) {
+		if(str == null || sub == null) {
+			return Boolean.FALSE;
+		} 
+		return str.endsWith(sub);
+	}	
 
 	/**
 	 * TODO: The treatment of negative start indexes is inconsistent here.

engine/src/main/java/org/teiid/query/function/source/SystemSource.java

@@ -604,6 +604,15 @@ private void addReplaceFunction() {
                     new FunctionParameter("replacement", DataTypeManager.DefaultDataTypes.STRING, QueryPlugin.Util.getString("SystemSource.Replace_arg3")) }, //$NON-NLS-1$ //$NON-NLS-2$
                 new FunctionParameter("result", DataTypeManager.DefaultDataTypes.STRING, QueryPlugin.Util.getString("SystemSource.Replace_result")) ) );                 //$NON-NLS-1$ //$NON-NLS-2$
     }
+    
+    private void addEndsWithFunction() {
+        functions.add(
+            new FunctionMethod(SourceSystemFunctions.ENDSWITH, QueryPlugin.Util.getString("SystemSource.endswith_desc"), STRING, FUNCTION_CLASS, "endsWith", //$NON-NLS-1$ //$NON-NLS-2$ 
+                new FunctionParameter[] {
+                    new FunctionParameter("substring", DataTypeManager.DefaultDataTypes.STRING, QueryPlugin.Util.getString("SystemSource.endswith_arg1")), //$NON-NLS-1$ //$NON-NLS-2$
+                    new FunctionParameter("string", DataTypeManager.DefaultDataTypes.STRING, QueryPlugin.Util.getString("SystemSource.endswith_arg2"))}, //$NON-NLS-1$ //$NON-NLS-2$
+                new FunctionParameter("result", DataTypeManager.DefaultDataTypes.STRING, QueryPlugin.Util.getString("SystemSource.endswith_result")) ) );                 //$NON-NLS-1$ //$NON-NLS-2$
+    }    
 
 	private void addRepeatFunction() {
 		functions.add(

engine/src/main/resources/org/teiid/metadata/SYS.sql

@@ -29,7 +29,11 @@ CREATE FOREIGN TABLE Columns (
 	Radix integer NOT NULL,
 	UID string(50) NOT NULL,
 	Description string(255),
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, SchemaName, TableName, Name),
+	FOREIGN KEY (VDBName, SchemaName, TableName) REFERENCES Tables (VDBName, SchemaName, Name),
+	FOREIGN KEY (DataType) REFERENCES DataTypes(Name),
+	UNIQUE (UID)
 );
 
 CREATE FOREIGN TABLE DataTypes (
@@ -51,7 +55,9 @@ CREATE FOREIGN TABLE DataTypes (
 	RuntimeType string(64),
 	BaseType string(64),
 	Description string(255),
-	OID integer
+	OID integer,
+	PRIMARY KEY (Name),
+	UNIQUE (UID)	
 );
 
 CREATE FOREIGN TABLE KeyColumns (
@@ -64,7 +70,10 @@ CREATE FOREIGN TABLE KeyColumns (
 	RefKeyUID string(50),
 	UID string(50) NOT NULL,
 	Position integer,
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, SchemaName, TableName, Name),
+	FOREIGN KEY (VDBName, SchemaName, TableName) REFERENCES Tables (VDBName, SchemaName, Name),
+	UNIQUE (UID)	
 );
 
 CREATE FOREIGN TABLE Keys (
@@ -78,7 +87,10 @@ CREATE FOREIGN TABLE Keys (
 	IsIndexed boolean NOT NULL,
 	RefKeyUID string(50),
 	UID string(50) NOT NULL,
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, SchemaName, TableName, Name),
+	FOREIGN KEY (VDBName, SchemaName, TableName) REFERENCES Tables (VDBName, SchemaName, Name),
+	UNIQUE (UID)
 );
 
 CREATE FOREIGN TABLE ProcedureParams (
@@ -97,7 +109,11 @@ CREATE FOREIGN TABLE ProcedureParams (
 	NullType string(10) NOT NULL,
 	UID string(50),
 	Description string(255),
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, SchemaName, ProcedureName, Name),
+	FOREIGN KEY (VDBName, SchemaName, ProcedureName) REFERENCES Procedures (VDBName, SchemaName, Name),
+	FOREIGN KEY (DataType) REFERENCES DataTypes(Name),
+	UNIQUE (UID)	
 );
 
 CREATE FOREIGN TABLE Procedures (
@@ -108,15 +124,19 @@ CREATE FOREIGN TABLE Procedures (
 	ReturnsResults boolean NOT NULL,
 	UID string(50) NOT NULL,
 	Description string(255),
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, SchemaName, Name),
+	FOREIGN KEY (VDBName, SchemaName) REFERENCES Schemas (VDBName, Name),
+	UNIQUE (UID)	
 );
 
 CREATE FOREIGN TABLE Properties (
 	Name string(255) NOT NULL,
 	"Value" string(255) NOT NULL,
 	UID string(50) NOT NULL,
 	OID integer,
-	ClobValue clob(2097152)
+	ClobValue clob(2097152),
+	UNIQUE(UID)
 );
 
 CREATE FOREIGN TABLE ReferenceKeyColumns (
@@ -143,7 +163,9 @@ CREATE FOREIGN TABLE Schemas (
 	UID string(50) NOT NULL,
 	Description string(255),
 	PrimaryMetamodelURI string(255) NOT NULL,
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, Name),
+	UNIQUE (UID)	
 );
 
 CREATE FOREIGN TABLE Tables (
@@ -159,12 +181,16 @@ CREATE FOREIGN TABLE Tables (
 	Description string(255),
 	IsSystem boolean,
 	IsMaterialized boolean NOT NULL,
-	OID integer
+	OID integer,
+	PRIMARY KEY (VDBName, SchemaName, Name),
+	FOREIGN KEY (VDBName, SchemaName) REFERENCES Schemas (VDBName, Name),
+	UNIQUE (UID)	
 );
 
 CREATE FOREIGN TABLE VirtualDatabases (
 	Name string(255) NOT NULL,
-	Version string(50) NOT NULL
+	Version string(50) NOT NULL,
+	PRIMARY KEY (Name, Version)
 );
 
 CREATE FOREIGN PROCEDURE getXMLSchemas(IN document string NOT NULL) RETURNS TABLE (schema xml)

engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql

@@ -7,12 +7,14 @@ CREATE FOREIGN TABLE MatViews (
 	Valid boolean,
 	LoadState string(255),
 	Updated timestamp,
-	Cardinality integer
+	Cardinality integer,
+	PRIMARY KEY (VDBName, SchemaName, Name)
 );
 
 CREATE FOREIGN TABLE VDBResources (
 	resourcePath string(255),
-	contents blob
+	contents blob,
+	PRIMARY KEY (resourcePath)
 );
 
 CREATE FOREIGN PROCEDURE isLoggable(OUT loggable boolean NOT NULL RESULT, IN level string NOT NULL DEFAULT 'DEBUG', IN context string NOT NULL DEFAULT 'org.teiid.PROCESSOR')

engine/src/main/resources/org/teiid/query/i18n.properties

@@ -640,6 +640,10 @@ SystemSource.decode_arg2=The encoding
 SystemSource.decode_result=byte representation Blob
 SystemSource.session_id_desc=Returns the session id of the currently logged in user 
 SystemSource.session_id_result=Returns the session id of the currently logged in user
+SystemSource.endswith_desc=Find if string has ending character sequence as defined in substring
+SystemSource.endswith_arg1=substring
+SystemSource.endswith_arg2=string
+SystemSource.endswith_result=true if string ends with character sequence of substring; false otherwise.
 TEIID30350=Element ''{0}'' not found.
 TEIID30351=Group ''{0}'' not found.
 TEIID30341=Function {0} is marked in the function metadata as a function that must be evaluated at the source.

engine/src/test/java/org/teiid/query/function/TestFunction.java

@@ -130,6 +130,11 @@ public static void helpTestLocate(String locateString, String input, int expecte
         int actualLocation = location.intValue();
         assertEquals("Didn't get expected result from locate", expectedLocation, actualLocation); //$NON-NLS-1$
     }
+    
+    public static void helpTestEndssWith(String locateString, String input, Boolean expected) {
+        Boolean actual = (Boolean) FunctionMethods.endsWith(locateString, input);
+        assertEquals("Didn't get expected result from startsWith", expected, actual); //$NON-NLS-1$
+    }    
 
     public static void helpTestLocate(String locateString, String input, Integer start, int expectedLocation) {
         Integer location = (Integer) FunctionMethods.locate(locateString, input, start);
@@ -626,7 +631,19 @@ public static void helpTestParseTimestamp(String tsStr, String format, String ex
     @Test public void testLocate8() throws Exception {
         helpTestLocate("z", "abab", -1, 0); //$NON-NLS-1$ //$NON-NLS-2$
     }
+    
+    @Test public void testEndsWith1() throws Exception {
+        helpTestEndssWith("z", "abab", false); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    
+    @Test public void testEndsWith2() throws Exception {
+    	helpTestEndssWith("b", "abab", true); //$NON-NLS-1$ //$NON-NLS-2$
+    }
 
+    @Test public void testEndsWith3() throws Exception {
+    	helpTestEndssWith("a", null, false); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+    
     @Test public void testBitand() throws Exception {
         // Both values are integers
         Integer result = (Integer) FunctionMethods.bitand(new Integer(0xFFF), new Integer(0x0F0));

engine/src/test/java/org/teiid/query/processor/TestTextTable.java

@@ -205,6 +205,18 @@ public class TestTextTable {
         process(sql, expected);
     }
 
+	@Test public void testCarraigeReturn() throws Exception {
+    	String sql = "select * from texttable('a,b\r\nc,d\r\ne,f' COLUMNS c1 string, c2 string) x"; //$NON-NLS-1$
+    	
+        List[] expected = new List[] {
+        		Arrays.asList("a", "b"),
+        		Arrays.asList("c", "d"),
+        		Arrays.asList("e", "f"),
+        };
+        
+        process(sql, expected);
+    }	
+	
 	@Test public void testQuote() throws Exception {
     	String sql = "select * from texttable('  \" a\", \" \"\" \"' COLUMNS c1 string, c2 string) x"; //$NON-NLS-1$
 

jboss-integration/pom.xml

@@ -147,7 +147,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    
-
+<dependency>
+  <groupId>org.jboss.as</groupId>
+  <artifactId>jboss-as-jaxrs</artifactId>
+  <version>7.1.1.Final</version>
+</dependency>
   </dependencies>
 
 </project>

jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java

@@ -1468,7 +1468,10 @@ protected void executeOperation(OperationContext context, DQPCore engine, ModelN
 
 		ServiceName svcName = ServiceName.JBOSS.append("deployment", "unit").append(rarName); //$NON-NLS-1$ //$NON-NLS-2$
 		ServiceController<?> sc = context.getServiceRegistry(false).getService(svcName);
-		DeploymentUnit du = DeploymentUnit.class.cast(sc.getValue());
+		if (sc == null) {
+			throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("RAR_notfound")));  //$NON-NLS-1$
+		}
+		DeploymentUnit du = DeploymentUnit.class.cast(sc.getValue()); 
 		ConnectorXmlDescriptor cd = du.getAttachment(ConnectorXmlDescriptor.ATTACHMENT_KEY);
 		ResourceAdapter ra = cd.getConnector().getResourceadapter();
 		if (ra instanceof ResourceAdapter1516) {

jboss-integration/src/main/java/org/teiid/jboss/TransportService.java

@@ -208,6 +208,8 @@ protected ClientServiceRegistry getClientServiceRegistry() {
 		DQP dqpProxy = proxyService(DQP.class, getDQP(), LogConstants.CTX_DQP);
     	this.csr.registerClientService(ILogon.class, logon, LogConstants.CTX_SECURITY);
     	this.csr.registerClientService(DQP.class, dqpProxy, LogConstants.CTX_DQP);
+    	//used by odata for metadata
+    	this.csr.registerClientService(VDBRepository.class, getVdbRepository(), LogConstants.CTX_DQP);
 	}
 
 	@Override

jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties

@@ -32,6 +32,7 @@ event_distributor_bound=org.teiid.events.EventDistributorFactory is bound to {0}
 TEIID50019=Re-deploying VDB {0}
 TEIID50054=Model {0} not found in VDB {1}.{2}
 TEIID50055=Source name {0} not found in Model {1} in VDB {1}.{2}  
+RAR_notfound=RAR file name supplied on operation is wrong or no such RAR file is currently deployed.
 
 distributed_cache_not_enabled= Distributed caching NOT enabled. Missing "distributed-cache" property in the configuration or running in standalone mode.
 TEIID50003=Distributed caching enabled.

pom.xml

@@ -40,6 +40,10 @@
         <version.sun.jaxb>2.2.4</version.sun.jaxb>
         <version.javax.wsdl4j>1.6.2</version.javax.wsdl4j>
         <version.junit>4.10</version.junit>
+        <version.javax.ws.rs>1.1</version.javax.ws.rs>
+        <version.org.odata4j>0.8.0-SNAPSHOT</version.org.odata4j>
+        <version.core4j>0.5</version.core4j>
+        <version.resteasy-jaxrs>2.3.2.Final</version.resteasy-jaxrs>
 	</properties>
 	<scm>
         <connection>scm:git:git://github.com/teiid/teiid.git</connection>
@@ -675,7 +679,52 @@
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
                 <version>${version.javax.wsdl4j}</version>
-            </dependency>  
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+                <version>${version.javax.ws.rs}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.odata4j</groupId>
+              <artifactId>odata4j-core</artifactId>
+              <version>${version.org.odata4j}</version>
+              <exclusions>                
+                    <exclusion>
+                        <groupId>org.eclipse.persistence</groupId>
+                        <artifactId>javax.persistence</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.ws.rs</groupId>
+                        <artifactId>jsr311-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.persistence</groupId>
+                        <artifactId>eclipselink</artifactId>
+                    </exclusion>  
+                    <!-- 
+                    <exclusion>
+                        <groupId>joda-time</groupId>
+                        <artifactId>joda-time</artifactId>
+                    </exclusion>    
+                     -->                  
+                </exclusions>              
+            </dependency>
+            <dependency>
+                <artifactId>core4j</artifactId>
+                <groupId>org.core4j</groupId>
+                <version>${version.core4j}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>resteasy-jaxrs</artifactId>
+                <version>${version.resteasy-jaxrs}</version>
+            </dependency>     
+            <dependency>
+                <groupId>org.jboss.spec.javax.servlet</groupId>
+                <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+                <version>1.0.0.Final</version>
+            </dependency>                  
 		</dependencies>
 	</dependencyManagement>
 	<modules>
@@ -695,5 +744,6 @@
 		<module>test-integration</module>
         <module>client-jdk15</module>
 		<module>admin</module>
+        <module>odata</module>
   </modules>
 </project>