Add test workitems

AbelCheng · AbelCheng · commit 1b429fdf67f8 · 2013-11-16T05:23:07.000Z
diff --git a/T4SQLTemplateLibrary/ConsoleTest/App.Config b/T4SQLTemplateLibrary/ConsoleTest/App.Config
@@ -5,7 +5,7 @@
 	</configSections>
 	<connectionStrings>
 		<!--<add name="T4SQLDB" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=T4SQLDB;Integrated Security=True"/>-->
-		<add name="T4SQLDB" providerName="Oracle.ManagedDataAccess.Client" connectionString="Data Source=ORCL;User Id=T4SQL;Password=T4SQL#Pwd" />
+		<add name="T4SQLDB" providerName="Oracle.ManagedDataAccess.Client" connectionString="Data Source=ORCL;User Id=/" />
 	</connectionStrings>
 	<appSettings>
 		<!--<add key="Engine_Package" value="T4SQL.ENGINE_" />-->
diff --git a/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/1-Tables/07-SEED_WORKITEM.sql b/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/1-Tables/07-SEED_WORKITEM.sql
@@ -6,11 +6,12 @@
 	WORKITEM_USER			NVARCHAR2(32),
 	MODIFIED_TIME			TIMESTAMP(3)	DEFAULT SYSTIMESTAMP	NOT NULL,
 	COMPILED_TIME			TIMESTAMP(3),
-	COMPILED_ERROR			NVARCHAR2(2000),
+	COMPILED_ERROR			VARCHAR2(4000),
 	OBJECT_CODE				CLOB,
 	BUILD_ORDER				NUMBER(4),
 	START_BUILD				CHAR(1)			DEFAULT 'N'				NOT NULL,
 
+	CONSTRAINT CK_START_BUILD CHECK (START_BUILD IN ('Y', 'N')),
 	CONSTRAINT PK_SEED_WORKITEM PRIMARY KEY (WORKITEM_NAME),
 	CONSTRAINT FK_SEED_WORKITEM_TEMPLATE_CLS FOREIGN KEY (TEMPLATE_NAME)
 		REFERENCES T4SQL.TEMPLATE_CLASS(FULL_NAME)
diff --git a/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/1-Tables/08-SEED_PROPERTY.sql b/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/1-Tables/08-SEED_PROPERTY.sql
@@ -2,7 +2,7 @@
 (
 	WORKITEM_NAME	NVARCHAR2(32)	NOT NULL,
 	PROPERTY_NAME	NVARCHAR2(64)	NOT NULL,
-	STRING_VALUE	VARCHAR2(4000)	NOT NULL,
+	STRING_VALUE	VARCHAR2(4000),
 	LINK_STATE		NVARCHAR2(256),
 
 	CONSTRAINT PK_SEED_PROPERTY PRIMARY KEY (WORKITEM_NAME, PROPERTY_NAME),
diff --git a/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/4-Packages/01-META.pck b/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/4-Packages/01-META.pck
@@ -250,7 +250,7 @@ PROCEDURE GET_TABLE_IN_TRIGGER
 	outTab_Schema	OUT VARCHAR2,
 	outTab_Name		OUT VARCHAR2
 )	AS
-	tTrigger		VARCHAR2(64)	:= REGEXP_SUBSTR(inCall_Stack, '^\s*\d+\s+\d+\s+(\w+\.TRG_\w+)\s*$', modifier => 'm', subexpression => 1);
+	tTrigger		VARCHAR2(64)	:= REGEXP_SUBSTR(inCall_Stack, '^\s*[[:xdigit:]]+\s+\d+\s+(\w+\.TRG_\w+)\s*$', modifier => 'm', subexpression => 1);
 	tTrg_Schema		VARCHAR2(30)	:= REGEXP_SUBSTR(tTrigger, '^[^.]+');
 	tTrg_Name		VARCHAR2(30)	:= REGEXP_SUBSTR(tTrigger, '[^.]+$');
 BEGIN
@@ -412,7 +412,7 @@ BEGIN
 	WORKITEM_USER			NVARCHAR2(32),
 	MODIFIED_TIME			TIMESTAMP(3)	DEFAULT SYSTIMESTAMP	NOT NULL,
 	COMPILED_TIME			TIMESTAMP(3),
-	COMPILED_ERROR			NVARCHAR2(2000),
+	COMPILED_ERROR			VARCHAR2(4000),
 	OBJECT_CODE				CLOB,
 	BUILD_ORDER				NUMBER(4),
 	START_BUILD				CHAR(1)			DEFAULT ''N''				NOT NULL,
@@ -427,7 +427,7 @@ BEGIN
 (
 	WORKITEM_NAME	NVARCHAR2(32)	NOT NULL,
 	PROPERTY_NAME	NVARCHAR2(64)	NOT NULL,
-	STRING_VALUE	VARCHAR2(4000)	NOT NULL,
+	STRING_VALUE	VARCHAR2(4000),
 	LINK_STATE		NVARCHAR2(256),
 
 	CONSTRAINT PK_' || tProperty_Table || ' PRIMARY KEY (WORKITEM_NAME, PROPERTY_NAME),
diff --git a/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/4-Packages/02-ENGINE.pck b/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/4-Packages/02-ENGINE.pck
@@ -413,8 +413,8 @@ FROM
 	' || inWorkitem_Table || '	I
 WHERE
 		C.FULL_NAME		= I.TEMPLATE_NAME
-	AND	C.IS_ACTIVE		= 1
-	AND	I.START_BUILD	= 1
+	AND	C.IS_ACTIVE		= ''Y''
+	AND	I.START_BUILD	= ''Y''
 ORDER BY
 	I.BUILD_ORDER
 ';
diff --git a/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/4-Packages/03-CMD.pck b/T4SQLTemplateLibrary/Databases/Oracle/T4SQLDB/Scripts/4-Packages/03-CMD.pck
@@ -47,7 +47,7 @@ TYPE NAME_ARRAY IS TABLE OF NVARCHAR2(32) INDEX BY PLS_INTEGER;
 	tHas_Condition			BOOLEAN;
 	tStart_Build			CHAR(1);
 	tObject_Code			CLOB;
-	tCompiled_Error			NVARCHAR2(2000);
+	tCompiled_Error			VARCHAR2(4000);
 BEGIN
 	tSQL	:= 'SELECT WORKITEM_NAME FROM ' || inWorkitem_Table;
 
diff --git a/T4SQLTemplateLibrary/Databases/Oracle/Test/Scripts/2-InitData/2-GenerateTestData.sql b/T4SQLTemplateLibrary/Databases/Oracle/Test/Scripts/2-InitData/2-GenerateTestData.sql
@@ -24,7 +24,7 @@ where
 order by
 	1, 2, 3
 ;
-
+/
 
 declare
 	tExists	PLS_INTEGER;
@@ -38,7 +38,7 @@ begin
 		values (1, 'What-If Simulation');
 	end if;
 end;
-
+/
 
 insert into test.simulation (id_, sim_desc, sim_type, creator)
 select
diff --git a/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Programmability/Stored Procedures/T4SQL.CMD_BUILD_SCRIPTS.sql b/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Programmability/Stored Procedures/T4SQL.CMD_BUILD_SCRIPTS.sql
@@ -47,11 +47,11 @@ AS
 	WAITFOR DELAY '00:00:06';
 
 	DECLARE @tI INT, @tAttempts INT, @tWorkitem_Name NVARCHAR(32), @tParmDef NVARCHAR(512);
-	DECLARE @tStart_Build BIT, @tObject_Code NVARCHAR(MAX), @tCompiled_Error NVARCHAR(2000);
+	DECLARE @tStart_Build BIT, @tObject_Code NVARCHAR(MAX), @tCompiled_Error NVARCHAR(4000);
 
 	SET @tSQL = N'SELECT @outStart_Build = START_BUILD, @outObject_Code = OBJECT_CODE, @outCompiled_Error = COMPILED_ERROR FROM '
 				+ @inWorkitem_Table + N' WHERE WORKITEM_NAME = @inWorkitem_Name';
-	SET @tParmDef = N'@inWorkitem_Name NVARCHAR(32), @outStart_Build BIT OUTPUT, @outObject_Code NVARCHAR(MAX) OUTPUT, @outCompiled_Error NVARCHAR(2000) OUTPUT';
+	SET @tParmDef = N'@inWorkitem_Name NVARCHAR(32), @outStart_Build BIT OUTPUT, @outObject_Code NVARCHAR(MAX) OUTPUT, @outCompiled_Error NVARCHAR(4000) OUTPUT';
 	SET	@outGenerated_Scripts	= N'';
 	SET @tI = 1;
 
diff --git a/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Programmability/Stored Procedures/T4SQL.ENGINE_COMPILE_WORKITEM.proc.sql b/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Programmability/Stored Procedures/T4SQL.ENGINE_COMPILE_WORKITEM.proc.sql
@@ -2,7 +2,7 @@
 (
 	@inWorkitem_Table	NVARCHAR(128),
 	@inWorkitem_Name	NVARCHAR(32),
-	@inCompiled_Error	NVARCHAR(2000),
+	@inCompiled_Error	NVARCHAR(4000),
 	@inObject_Code		NVARCHAR(MAX)
 )
 AS
@@ -19,7 +19,7 @@ AS
 		WORKITEM_NAME	= @Workitem_Name
 ';
 
-	SET	@ParmDefinition = N'@Compiled_Error NVARCHAR(2000), @Object_Code NVARCHAR(MAX), @Workitem_Name NVARCHAR(32)';
+	SET	@ParmDefinition = N'@Compiled_Error NVARCHAR(4000), @Object_Code NVARCHAR(MAX), @Workitem_Name NVARCHAR(32)';
 
 	EXECUTE sp_executesql @tSQL, @ParmDefinition, @Compiled_Error = @inCompiled_Error, @Object_Code = @inObject_Code, @Workitem_Name = @inWorkitem_Name;
 	
diff --git a/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Programmability/Stored Procedures/T4SQL.META_CREATE_WORKSPACE.sql b/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Programmability/Stored Procedures/T4SQL.META_CREATE_WORKSPACE.sql
@@ -28,7 +28,7 @@ AS
 	WORKITEM_USER			NVARCHAR(32),
 	MODIFIED_TIME			DATETIME		NOT NULL	DEFAULT GETDATE(),
 	COMPILED_TIME			DATETIME,
-	COMPILED_ERROR			NVARCHAR(2000),
+	COMPILED_ERROR			NVARCHAR(4000),
 	OBJECT_CODE				NVARCHAR(MAX),
 	BUILD_ORDER				INT,
 	START_BUILD				BIT				NOT NULL	DEFAULT 0,
@@ -47,7 +47,7 @@ AS
 (
 	WORKITEM_NAME	NVARCHAR(32)	NOT NULL,
 	PROPERTY_NAME	NVARCHAR(64)	NOT NULL,
-	STRING_VALUE	NVARCHAR(4000)	NOT NULL,
+	STRING_VALUE	NVARCHAR(4000),
 	LINK_STATE		NVARCHAR(256),
 
 	CONSTRAINT PK_' + @tTab + N' PRIMARY KEY (WORKITEM_NAME, PROPERTY_NAME),
diff --git a/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Tables/T4SQL.SEED_PROPERTY.table.sql b/T4SQLTemplateLibrary/Databases/SqlServer/Schema Objects/Schemas/T4SQL/Tables/T4SQL.SEED_PROPERTY.table.sql
@@ -2,7 +2,7 @@
 (
 	WORKITEM_NAME	NVARCHAR(32)	NOT NULL,
 	PROPERTY_NAME	NVARCHAR(64)	NOT NULL,
-	STRING_VALUE	NVARCHAR(4000)	NOT NULL,
+	STRING_VALUE	NVARCHAR(4000),
 	LINK_STATE		NVARCHAR(256),
 
 	CONSTRAINT PK_SEED_PROPERTY PRIMARY KEY (WORKITEM_NAME, PROPERTY_NAME),
diff --git a/T4SQLTemplateLibrary/EngineService/App.Config b/T4SQLTemplateLibrary/EngineService/App.Config
@@ -1,14 +1,35 @@
 ﻿<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
+	<configSections>
+		<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess" />
+	</configSections>
 	<connectionStrings>
-		<add name="T4SQLDB" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=T4SQLDB;Integrated Security=True"/>
+		<!--<add name="T4SQLDB" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=T4SQLDB;Integrated Security=True"/>-->
+		<add name="T4SQLDB" providerName="Oracle.ManagedDataAccess.Client" connectionString="Data Source=ORCL;User Id=/" />
 	</connectionStrings>
 	<appSettings>
-		<add key="Engine_Package" value="T4SQL.ENGINE_" />
+		<!--<add key="Engine_Package" value="T4SQL.ENGINE_" />-->
+		<add key="Engine_Package" value="T4SQL.ENGINE." />
 	</appSettings>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<probing privatePath="Templates"/>
 		</assemblyBinding>
 	</runtime>
+	<system.data>
+		<DbProviderFactories>
+			<!-- Remove in case this is already defined in machine.config -->
+			<remove invariant="Oracle.ManagedDataAccess.Client" />
+			<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess" />
+		</DbProviderFactories>
+	</system.data>
+	<oracle.manageddataaccess.client>
+		<version number="*">
+			<settings>
+				<!-- Set this path if you are using TNS aliases as connection strings -->
+				<!-- Instead you can use "SERVER_NAME:PORT/SERVICE_NAME" as your data source -->
+				<setting name="TNS_ADMIN" value="C:\oracle\product\11.2.0\client_1\network\admin" />
+			</settings>
+		</version>
+	</oracle.manageddataaccess.client>
 </configuration>
diff --git a/T4SQLTemplateLibrary/SqlBuilder/Workspace.cs b/T4SQLTemplateLibrary/SqlBuilder/Workspace.cs
@@ -72,7 +72,7 @@ public void BuildWorkitems(DbAccess dbAccess, TemplateManager templateManager, D
 			dbAccess.LoadWorkingProperties(_Property_Table_Name, row =>
 				{
 					SetWorkingProperty(row.Field<string>("WORKITEM_NAME"), row.Field<string>("PROPERTY_NAME"),
-						row.Field<string>("STRING_VALUE"), row.Field<string>("LINK_STATE"));
+						row.Field<string>("STRING_VALUE") ?? string.Empty, row.Field<string>("LINK_STATE") ?? string.Empty);
 				});
 
 			foreach (Workitem wi in _Workitems)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`(`
`3`	`3`	`WORKITEM_NAME NVARCHAR2(32) NOT NULL,`
`4`	`4`	`PROPERTY_NAME NVARCHAR2(64) NOT NULL,`
`5`		`- STRING_VALUE VARCHAR2(4000) NOT NULL,`
	`5`	`+ STRING_VALUE VARCHAR2(4000),`
`6`	`6`	`LINK_STATE NVARCHAR2(256),`
`7`	`7`
`8`	`8`	`CONSTRAINT PK_SEED_PROPERTY PRIMARY KEY (WORKITEM_NAME, PROPERTY_NAME),`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`(`
`3`	`3`	`@inWorkitem_Table NVARCHAR(128),`
`4`	`4`	`@inWorkitem_Name NVARCHAR(32),`
`5`		`- @inCompiled_Error NVARCHAR(2000),`
	`5`	`+ @inCompiled_Error NVARCHAR(4000),`
`6`	`6`	`@inObject_Code NVARCHAR(MAX)`
`7`	`7`	`)`
`8`	`8`	`AS`
`@@ -19,7 +19,7 @@ AS`
`19`	`19`	`WORKITEM_NAME = @Workitem_Name`
`20`	`20`	`';`
`21`	`21`
`22`		`- SET @ParmDefinition = N'@Compiled_Error NVARCHAR(2000), @Object_Code NVARCHAR(MAX), @Workitem_Name NVARCHAR(32)';`
	`22`	`+ SET @ParmDefinition = N'@Compiled_Error NVARCHAR(4000), @Object_Code NVARCHAR(MAX), @Workitem_Name NVARCHAR(32)';`
`23`	`23`
`24`	`24`	`EXECUTE sp_executesql @tSQL, @ParmDefinition, @Compiled_Error = @inCompiled_Error, @Object_Code = @inObject_Code, @Workitem_Name = @inWorkitem_Name;`
`25`	`25`