Fix multiple sp with same name

conwid · conwid · commit 928a8680122a · 2019-01-14T15:19:29.000+01:00
diff --git a/AzureDocumentDbDriver/AzureCosmosDbDriver.csproj b/AzureDocumentDbDriver/AzureCosmosDbDriver.csproj
@@ -119,7 +119,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Debug DevDeploy.bat
-if $(ConfigurationName) == Release powershell.exe -file "ReleaseDeploy.ps1" -folder "$(TargetDir)</PostBuildEvent>
+if $(ConfigurationName) == Release powershell.exe -NonInteractive -executionPolicy Unrestricted -file "ReleaseDeploy.ps1" -folder "$(TargetDir)</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\packages\Microsoft.Azure.DocumentDB.1.22.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.22.0\build\Microsoft.Azure.DocumentDB.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/AzureDocumentDbDriver/Common/DriverHelper.cs b/AzureDocumentDbDriver/Common/DriverHelper.cs
@@ -38,8 +38,7 @@ public static IEnumerable<string> GetNamespaceToAdd() =>
 
         public static string GetConnectionDescription(IConnectionInfo cxInfo)
         {
-            var props = new Properties(cxInfo);
-            List<ExpandoObject> o = new List<ExpandoObject>();
+            var props = new Properties(cxInfo);            
             return $"{props.Uri}/{props.Database}";
         }
 
@@ -55,7 +54,7 @@ public static ParameterDescriptor[] GetContextConstructorParameters(IConnectionI
 
         internal static IDbConnection GetIDbConnection(IConnectionInfo cxInfo)
         {
-            Properties props = new Properties(cxInfo);
+            var props = new Properties(cxInfo);
             return new CosmosDbSqlConnection(props.Uri, props.AccountKey, props.Database);
         }
 
@@ -65,7 +64,7 @@ public static DbProviderFactory GetProviderFactory(IConnectionInfo cxInfo)
             {
                 throw new NotSupportedException($"Only {CosmosDbSqlProviderFactory.ProviderName} is supported; requested {cxInfo.DatabaseInfo.Provider}");
             }
-            Properties props = new Properties(cxInfo);
+            var props = new Properties(cxInfo);
             return new CosmosDbSqlProviderFactory(props.Uri, props.AccountKey, props.Database);
         }
 
diff --git a/AzureDocumentDbDriver/Common/Properties.cs b/AzureDocumentDbDriver/Common/Properties.cs
@@ -7,39 +7,39 @@ namespace AzureCosmosDbDriver.Common
 
     public class Properties
     {
-        readonly IConnectionInfo _cxInfo;
-        readonly XElement _driverData;
+        private readonly IConnectionInfo cxInfo;
+        private readonly XElement driverData;
 
         public Properties(IConnectionInfo cxInfo)
         {
-            _cxInfo = cxInfo;
-            _driverData = cxInfo.DriverData;
+            this.cxInfo = cxInfo;
+            driverData = cxInfo.DriverData;
         }
 
-        public ICustomTypeInfo CustomTypeInfo => _cxInfo.CustomTypeInfo;
+        public ICustomTypeInfo CustomTypeInfo => cxInfo.CustomTypeInfo;
 
         public bool Persist
         {
-            get => _cxInfo.Persist;
-            set => _cxInfo.Persist = value;
+            get => cxInfo.Persist;
+            set => cxInfo.Persist = value;
         }
 
         public string Uri
         {
-            get => (string)_driverData.Element("Uri") ?? string.Empty;
-            set => _driverData.SetElementValue("Uri", value);
+            get => (string)driverData.Element(nameof(Uri)) ?? string.Empty;
+            set => driverData.SetElementValue(nameof(Uri), value);
         }
 
         public string AccountKey
         {
-            get => (string)_driverData.Element("AccountKey") ?? string.Empty;
-            set => _driverData.SetElementValue("AccountKey", value);
+            get => (string)driverData.Element(nameof(AccountKey)) ?? string.Empty;
+            set => driverData.SetElementValue(nameof(AccountKey), value);
         }
 
         public string Database
         {
-            get => (string)_driverData.Element("Database") ?? string.Empty;
-            set => _driverData.SetElementValue("Database", value);
+            get => (string)driverData.Element(nameof(Database)) ?? string.Empty;
+            set => driverData.SetElementValue(nameof(Database), value);
         }
     }
 
diff --git a/AzureDocumentDbDriver/Common/SchemaBuilder.cs b/AzureDocumentDbDriver/Common/SchemaBuilder.cs
@@ -25,7 +25,7 @@ public static List<ExplorerItem> GetSchema(Properties props)
                     Children = new List<ExplorerItem>()
                 };
 
-                List<DocumentCollection> collections = client.CreateDocumentCollectionQuery(database.SelfLink).ToList();
+                var collections = client.CreateDocumentCollectionQuery(database.SelfLink).ToList();
                 foreach (var collection in collections)
                 {
                     var collectionItem = new ExplorerItem(collection.Id, ExplorerItemKind.QueryableObject, ExplorerIcon.Table) { IsEnumerable = true, Tag = collection.Id, Children = new List<ExplorerItem>() };
@@ -78,7 +78,7 @@ private static string GenerateCode(IEnumerable<ExplorerItem> collections, string
 
                 foreach (var sp in collection.Children.Single(s => s.Text == "Stored procedures").Children)
                 {
-                    code = code + $" public IEnumerable<dynamic> {sp.Tag}(params dynamic[] parameters)" +
+                    code = code + $" public IEnumerable<dynamic> {collection.Tag}_{sp.Tag}(params dynamic[] parameters)" +
                                 "{" +
                                    $" return base.ExecuteDynamicStoredProcedure(\"{sp.Tag}\",\"{collection.Tag}\", parameters).ToList();" +
                                 "}";
@@ -112,8 +112,9 @@ private static void BuildAssembly(string code, AssemblyName name, string driverF
                 results = codeProvider.CompileAssemblyFromSource(options, code);
             }
             if (results.Errors.Count > 0)
-                throw new Exception
-                    ("Cannot compile typed context: " + results.Errors[0].ErrorText + " (line " + results.Errors[0].Line + ")");
+            {
+                throw new Exception("Cannot compile typed context: " + results.Errors[0].ErrorText + " (line " + results.Errors[0].Line + ")");
+            }
         }
     }
 }
diff --git a/AzureDocumentDbDriver/Dynamic/ConnectionDialog.xaml.cs b/AzureDocumentDbDriver/Dynamic/ConnectionDialog.xaml.cs
@@ -17,24 +17,23 @@
 
 namespace AzureCosmosDbDriver.Dynamic
 {
-	/// <summary>
-	/// Interaction logic for ConnectionDialog.xaml
-	/// </summary>
-	public partial class ConnectionDialog : Window
-	{
-		private Properties properties;
+    /// <summary>
+    /// Interaction logic for ConnectionDialog.xaml
+    /// </summary>
+    public partial class ConnectionDialog : Window
+    {
+        private readonly Properties properties;
 
-		public ConnectionDialog(IConnectionInfo cxInfo)
-		{
-            cxInfo.DatabaseInfo.Provider = CosmosDbSqlProviderFactory.ProviderName;                   
-			DataContext = properties = new Properties (cxInfo);
-			Background = SystemColors.ControlBrush;
-			InitializeComponent ();            
-		}	
+        public ConnectionDialog(IConnectionInfo cxInfo)
+        {
+            cxInfo.DatabaseInfo.Provider = CosmosDbSqlProviderFactory.ProviderName;
+            properties = new Properties(cxInfo);
+            DataContext = properties;
+            Background = SystemColors.ControlBrush;
+            InitializeComponent();
+        }
 
-		void btnOK_Click (object sender, RoutedEventArgs e)
-		{
-			DialogResult = true;            
-		}
-	}
+        private void btnOK_Click(object sender, RoutedEventArgs e) => DialogResult = true;
+
+    }
 }
diff --git a/AzureDocumentDbDriver/Properties/AssemblyInfo.cs b/AzureDocumentDbDriver/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/AzureDocumentDbDriver/ReleaseDeploy.ps1 b/AzureDocumentDbDriver/ReleaseDeploy.ps1
@@ -1,4 +1,4 @@
-﻿ param ([string] $folder)
+﻿param ([string] $folder)
 
 $sourceFolder=[System.IO.Path]::Combine($folder.Replace('"',''))
 $targetFolder=[System.IO.Path]::Combine($sourceFolder,"ReleasePackage")
@@ -7,6 +7,7 @@ $pngFiles=[System.IO.Path]::Combine($sourceFolder,"*.png");
 $dllFiles=[System.IO.Path]::Combine($sourceFolder,"*.dll")
 $zipFile=[System.IO.Path]::Combine($sourceFolder,"AzureCosmosDbDriver.lpx")
 
+
 If (Test-Path $targetFolder){
 	Remove-Item $targetFolder -Recurse -Force
 }
diff --git a/AzureDocumentDbDriver/Static/ConnectionDialog.xaml.cs b/AzureDocumentDbDriver/Static/ConnectionDialog.xaml.cs
@@ -34,10 +34,7 @@ public ConnectionDialog(IConnectionInfo cxInfo)
             InitializeComponent();
         }
 
-        void btnOK_Click(object sender, RoutedEventArgs e)
-        {
-            DialogResult = true;
-        }
+        private void btnOK_Click(object sender, RoutedEventArgs e) =>DialogResult = true;        
 
         void BrowseAssembly(object sender, RoutedEventArgs e)
         {
@@ -48,21 +45,23 @@ void BrowseAssembly(object sender, RoutedEventArgs e)
             };
 
             if (dialog.ShowDialog() == true)
+            {
                 cxInfo.CustomTypeInfo.CustomAssemblyPath = dialog.FileName;
+            }
         }
 
-        void ChooseType(object sender, RoutedEventArgs e)
+        private void ChooseType(object sender, RoutedEventArgs e)
         {
-            string assemPath = cxInfo.CustomTypeInfo.CustomAssemblyPath;
-            if (assemPath.Length == 0)
+            string assemblyPath = cxInfo.CustomTypeInfo.CustomAssemblyPath;
+            if (assemblyPath.Length == 0)
             {
                 MessageBox.Show("First enter a path to an assembly.");
                 return;
             }
 
-            if (!File.Exists(assemPath))
+            if (!File.Exists(assemblyPath))
             {
-                MessageBox.Show("File '" + assemPath + "' does not exist.");
+                MessageBox.Show("File '" + assemblyPath + "' does not exist.");
                 return;
             }
 
@@ -82,8 +81,11 @@ void ChooseType(object sender, RoutedEventArgs e)
                 return;
             }
 
-            string result = (string)LINQPad.Extensibility.DataContext.UI.Dialogs.PickFromList("Choose Custom Type", customTypes);
-            if (result != null) cxInfo.CustomTypeInfo.CustomTypeName = result;
+            var result = (string)LINQPad.Extensibility.DataContext.UI.Dialogs.PickFromList("Choose Custom Type", customTypes);
+            if (result != null)
+            {
+                cxInfo.CustomTypeInfo.CustomTypeName = result;
+            }
         }
     }
 }
diff --git a/CosmosDbAdoNetProvider b/CosmosDbAdoNetProvider
@@ -1 +1 @@
-Subproject commit a400fe917dcbabb4e3b6bf59322472b30383f91b
+Subproject commit 0afceb7f62be383a527a5cd51d9ca118daf0abee
diff --git a/CosmosDbContext b/CosmosDbContext
@@ -1 +1 @@
-Subproject commit 7db76a870edc8374b428a5f92a2ffb53c8355e38
+Subproject commit 5aa2c9e64df6ea30b66d91646541910ad27049e2

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public static IEnumerable<string> GetNamespaceToAdd() =>`
`38`	`38`
`39`	`39`	`public static string GetConnectionDescription(IConnectionInfo cxInfo)`
`40`	`40`	`{`
`41`		`- var props = new Properties(cxInfo);`
`42`		`- List<ExpandoObject> o = new List<ExpandoObject>();`
	`41`	`+ var props = new Properties(cxInfo);`
`43`	`42`	`return $"{props.Uri}/{props.Database}";`
`44`	`43`	`}`
`45`	`44`
`@@ -55,7 +54,7 @@ public static ParameterDescriptor[] GetContextConstructorParameters(IConnectionI`
`55`	`54`
`56`	`55`	`internal static IDbConnection GetIDbConnection(IConnectionInfo cxInfo)`
`57`	`56`	`{`
`58`		`- Properties props = new Properties(cxInfo);`
	`57`	`+ var props = new Properties(cxInfo);`
`59`	`58`	`return new CosmosDbSqlConnection(props.Uri, props.AccountKey, props.Database);`
`60`	`59`	`}`
`61`	`60`
`@@ -65,7 +64,7 @@ public static DbProviderFactory GetProviderFactory(IConnectionInfo cxInfo)`
`65`	`64`	`{`
`66`	`65`	`throw new NotSupportedException($"Only {CosmosDbSqlProviderFactory.ProviderName} is supported; requested {cxInfo.DatabaseInfo.Provider}");`
`67`	`66`	`}`
`68`		`- Properties props = new Properties(cxInfo);`
	`67`	`+ var props = new Properties(cxInfo);`
`69`	`68`	`return new CosmosDbSqlProviderFactory(props.Uri, props.AccountKey, props.Database);`
`70`	`69`	`}`
`71`	`70`
Original file line number	Diff line number	Diff line change
`@@ -7,39 +7,39 @@ namespace AzureCosmosDbDriver.Common`
`7`	`7`
`8`	`8`	`public class Properties`
`9`	`9`	`{`
`10`		`- readonly IConnectionInfo _cxInfo;`
`11`		`- readonly XElement _driverData;`
	`10`	`+ private readonly IConnectionInfo cxInfo;`
	`11`	`+ private readonly XElement driverData;`
`12`	`12`
`13`	`13`	`public Properties(IConnectionInfo cxInfo)`
`14`	`14`	`{`
`15`		`- _cxInfo = cxInfo;`
`16`		`- _driverData = cxInfo.DriverData;`
	`15`	`+ this.cxInfo = cxInfo;`
	`16`	`+ driverData = cxInfo.DriverData;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public ICustomTypeInfo CustomTypeInfo => _cxInfo.CustomTypeInfo;`
	`19`	`+ public ICustomTypeInfo CustomTypeInfo => cxInfo.CustomTypeInfo;`
`20`	`20`
`21`	`21`	`public bool Persist`
`22`	`22`	`{`
`23`		`- get => _cxInfo.Persist;`
`24`		`- set => _cxInfo.Persist = value;`
	`23`	`+ get => cxInfo.Persist;`
	`24`	`+ set => cxInfo.Persist = value;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public string Uri`
`28`	`28`	`{`
`29`		`- get => (string)_driverData.Element("Uri") ?? string.Empty;`
`30`		`- set => _driverData.SetElementValue("Uri", value);`
	`29`	`+ get => (string)driverData.Element(nameof(Uri)) ?? string.Empty;`
	`30`	`+ set => driverData.SetElementValue(nameof(Uri), value);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public string AccountKey`
`34`	`34`	`{`
`35`		`- get => (string)_driverData.Element("AccountKey") ?? string.Empty;`
`36`		`- set => _driverData.SetElementValue("AccountKey", value);`
	`35`	`+ get => (string)driverData.Element(nameof(AccountKey)) ?? string.Empty;`
	`36`	`+ set => driverData.SetElementValue(nameof(AccountKey), value);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public string Database`
`40`	`40`	`{`
`41`		`- get => (string)_driverData.Element("Database") ?? string.Empty;`
`42`		`- set => _driverData.SetElementValue("Database", value);`
	`41`	`+ get => (string)driverData.Element(nameof(Database)) ?? string.Empty;`
	`42`	`+ set => driverData.SetElementValue(nameof(Database), value);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static List<ExplorerItem> GetSchema(Properties props)`
`25`	`25`	`Children = new List<ExplorerItem>()`
`26`	`26`	`};`
`27`	`27`
`28`		`- List<DocumentCollection> collections = client.CreateDocumentCollectionQuery(database.SelfLink).ToList();`
	`28`	`+ var collections = client.CreateDocumentCollectionQuery(database.SelfLink).ToList();`
`29`	`29`	`foreach (var collection in collections)`
`30`	`30`	`{`
`31`	`31`	`var collectionItem = new ExplorerItem(collection.Id, ExplorerItemKind.QueryableObject, ExplorerIcon.Table) { IsEnumerable = true, Tag = collection.Id, Children = new List<ExplorerItem>() };`
`@@ -78,7 +78,7 @@ private static string GenerateCode(IEnumerable<ExplorerItem> collections, string`
`78`	`78`
`79`	`79`	`foreach (var sp in collection.Children.Single(s => s.Text == "Stored procedures").Children)`
`80`	`80`	`{`
`81`		`- code = code + $" public IEnumerable<dynamic> {sp.Tag}(params dynamic[] parameters)" +`
	`81`	`+ code = code + $" public IEnumerable<dynamic> {collection.Tag}_{sp.Tag}(params dynamic[] parameters)" +`
`82`	`82`	`"{" +`
`83`	`83`	`$" return base.ExecuteDynamicStoredProcedure(\"{sp.Tag}\",\"{collection.Tag}\", parameters).ToList();" +`
`84`	`84`	`"}";`
`@@ -112,8 +112,9 @@ private static void BuildAssembly(string code, AssemblyName name, string driverF`
`112`	`112`	`results = codeProvider.CompileAssemblyFromSource(options, code);`
`113`	`113`	`}`
`114`	`114`	`if (results.Errors.Count > 0)`
`115`		`- throw new Exception`
`116`		`- ("Cannot compile typed context: " + results.Errors[0].ErrorText + " (line " + results.Errors[0].Line + ")");`
	`115`	`+ {`
	`116`	`+ throw new Exception("Cannot compile typed context: " + results.Errors[0].ErrorText + " (line " + results.Errors[0].Line + ")");`
	`117`	`+ }`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,7 @@ public ConnectionDialog(IConnectionInfo cxInfo)`
`34`	`34`	`InitializeComponent();`
`35`	`35`	`}`
`36`	`36`
`37`		`- void btnOK_Click(object sender, RoutedEventArgs e)`
`38`		`- {`
`39`		`- DialogResult = true;`
`40`		`- }`
	`37`	`+ private void btnOK_Click(object sender, RoutedEventArgs e) =>DialogResult = true;`
`41`	`38`
`42`	`39`	`void BrowseAssembly(object sender, RoutedEventArgs e)`
`43`	`40`	`{`
`@@ -48,21 +45,23 @@ void BrowseAssembly(object sender, RoutedEventArgs e)`
`48`	`45`	`};`
`49`	`46`
`50`	`47`	`if (dialog.ShowDialog() == true)`
	`48`	`+ {`
`51`	`49`	`cxInfo.CustomTypeInfo.CustomAssemblyPath = dialog.FileName;`
	`50`	`+ }`
`52`	`51`	`}`
`53`	`52`
`54`		`- void ChooseType(object sender, RoutedEventArgs e)`
	`53`	`+ private void ChooseType(object sender, RoutedEventArgs e)`
`55`	`54`	`{`
`56`		`- string assemPath = cxInfo.CustomTypeInfo.CustomAssemblyPath;`
`57`		`- if (assemPath.Length == 0)`
	`55`	`+ string assemblyPath = cxInfo.CustomTypeInfo.CustomAssemblyPath;`
	`56`	`+ if (assemblyPath.Length == 0)`
`58`	`57`	`{`
`59`	`58`	`MessageBox.Show("First enter a path to an assembly.");`
`60`	`59`	`return;`
`61`	`60`	`}`
`62`	`61`
`63`		`- if (!File.Exists(assemPath))`
	`62`	`+ if (!File.Exists(assemblyPath))`
`64`	`63`	`{`
`65`		`- MessageBox.Show("File '" + assemPath + "' does not exist.");`
	`64`	`+ MessageBox.Show("File '" + assemblyPath + "' does not exist.");`
`66`	`65`	`return;`
`67`	`66`	`}`
`68`	`67`
`@@ -82,8 +81,11 @@ void ChooseType(object sender, RoutedEventArgs e)`
`82`	`81`	`return;`
`83`	`82`	`}`
`84`	`83`
`85`		`- string result = (string)LINQPad.Extensibility.DataContext.UI.Dialogs.PickFromList("Choose Custom Type", customTypes);`
`86`		`- if (result != null) cxInfo.CustomTypeInfo.CustomTypeName = result;`
	`84`	`+ var result = (string)LINQPad.Extensibility.DataContext.UI.Dialogs.PickFromList("Choose Custom Type", customTypes);`
	`85`	`+ if (result != null)`
	`86`	`+ {`
	`87`	`+ cxInfo.CustomTypeInfo.CustomTypeName = result;`
	`88`	`+ }`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`	`}`