Revert "Revert "Merge branch 'master' of https://git.bib.de/PBS2H23AMA/PMC_Projekt""
This reverts commit a63f4e4b87.
			
			
This commit is contained in:
		@@ -38,9 +38,15 @@
 | 
				
			|||||||
              "Title": "Program.cs",
 | 
					              "Title": "Program.cs",
 | 
				
			||||||
              "DocumentMoniker": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
 | 
					              "DocumentMoniker": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
 | 
				
			||||||
              "RelativeDocumentMoniker": "PMCProjekt\\Program.cs",
 | 
					              "RelativeDocumentMoniker": "PMCProjekt\\Program.cs",
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
              "ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs*",
 | 
					              "ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs*",
 | 
				
			||||||
              "RelativeToolTip": "PMCProjekt\\Program.cs*",
 | 
					              "RelativeToolTip": "PMCProjekt\\Program.cs*",
 | 
				
			||||||
              "ViewState": "AQIAADYAAAAAAAAAAAAAAEIAAABAAAAA",
 | 
					              "ViewState": "AQIAADYAAAAAAAAAAAAAAEIAAABAAAAA",
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					              "ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
 | 
				
			||||||
 | 
					              "RelativeToolTip": "PMCProjekt\\Program.cs",
 | 
				
			||||||
 | 
					              "ViewState": "AQIAACUAAAAAAAAAAAAqwDcAAABAAAAA",
 | 
				
			||||||
 | 
					>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
 | 
				
			||||||
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
 | 
					              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
 | 
				
			||||||
              "WhenOpened": "2024-05-29T10:43:22.805Z",
 | 
					              "WhenOpened": "2024-05-29T10:43:22.805Z",
 | 
				
			||||||
              "EditorCaption": ""
 | 
					              "EditorCaption": ""
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,11 @@ namespace PMCProjekt
 | 
				
			|||||||
            MySql.Data.MySqlClient.MySqlConnection myConnection;
 | 
					            MySql.Data.MySqlClient.MySqlConnection myConnection;
 | 
				
			||||||
            string myConnectionString;
 | 
					            string myConnectionString;
 | 
				
			||||||
            //set the correct values for your server, user, password and database name
 | 
					            //set the correct values for your server, user, password and database name
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
            myConnectionString = "server=localhost;uid=root;pwd=root;database=import_export";
 | 
					            myConnectionString = "server=localhost;uid=root;pwd=root;database=import_export";
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					            myConnectionString = "server=localhost;uid=root;pwd=root;database=vr_contact";
 | 
				
			||||||
 | 
					>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
@@ -53,18 +57,29 @@ namespace PMCProjekt
 | 
				
			|||||||
                // create a MySQL command and set the SQL statement with parameters
 | 
					                // create a MySQL command and set the SQL statement with parameters
 | 
				
			||||||
                MySqlCommand myCommand = new MySqlCommand();
 | 
					                MySqlCommand myCommand = new MySqlCommand();
 | 
				
			||||||
                myCommand.Connection = myConnection;
 | 
					                myCommand.Connection = myConnection;
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
                myCommand.CommandText = @"SELECT * FROM user";
 | 
					                myCommand.CommandText = @"SELECT * FROM user";
 | 
				
			||||||
                //myCommand.Parameters.AddWithValue("@code", "12");
 | 
					                //myCommand.Parameters.AddWithValue("@code", "12");
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					                myCommand.CommandText = @"SELECT * FROM workshop WHERE maxParticipants = @code;";
 | 
				
			||||||
 | 
					                myCommand.Parameters.AddWithValue("@code", "12");
 | 
				
			||||||
 | 
					>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                // execute the command and read the results
 | 
					                // execute the command and read the results
 | 
				
			||||||
                using MySqlDataReader myReader = myCommand.ExecuteReader();
 | 
					                using MySqlDataReader myReader = myCommand.ExecuteReader();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                while (myReader.Read())
 | 
					                while (myReader.Read())
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
                    int id = myReader.GetInt32("id");
 | 
					                    int id = myReader.GetInt32("id");
 | 
				
			||||||
                    string name = myReader.GetString("firstname");
 | 
					                    string name = myReader.GetString("firstname");
 | 
				
			||||||
                    string nachname = myReader.GetString("lastname");
 | 
					                    string nachname = myReader.GetString("lastname");
 | 
				
			||||||
                    Console.WriteLine(id + " " + nachname + " " + name);
 | 
					                    Console.WriteLine(id + " " + nachname + " " + name);
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					                    int id = myReader.GetInt32("maxParticipants");
 | 
				
			||||||
 | 
					                    string name = myReader.GetString("title");
 | 
				
			||||||
 | 
					                    Console.WriteLine(id + " " + name);
 | 
				
			||||||
 | 
					>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                myConnection.Close();
 | 
					                myConnection.Close();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,11 @@ using System.Reflection;
 | 
				
			|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("PMCProjekt")]
 | 
					[assembly: System.Reflection.AssemblyCompanyAttribute("PMCProjekt")]
 | 
				
			||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 | 
					[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 | 
				
			||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 | 
					[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+17dccf1f6d116de89483d6a78bb50c19dc487b23")]
 | 
					[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+17dccf1f6d116de89483d6a78bb50c19dc487b23")]
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cbf9d009a817c48512e639ae3b82994e8bd14d2a")]
 | 
				
			||||||
 | 
					>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
 | 
				
			||||||
[assembly: System.Reflection.AssemblyProductAttribute("PMCProjekt")]
 | 
					[assembly: System.Reflection.AssemblyProductAttribute("PMCProjekt")]
 | 
				
			||||||
[assembly: System.Reflection.AssemblyTitleAttribute("PMCProjekt")]
 | 
					[assembly: System.Reflection.AssemblyTitleAttribute("PMCProjekt")]
 | 
				
			||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 | 
					[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1,5 @@
 | 
				
			|||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
3bf2454e1464aab8822817168f63b8e3c2fd9507ec42922ba8a9ca9671eb53e1
 | 
					3bf2454e1464aab8822817168f63b8e3c2fd9507ec42922ba8a9ca9671eb53e1
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					a1838728addb127ce57187402831e23d5da8b8644680230e2f61341fb5e73c1a
 | 
				
			||||||
 | 
					>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user