Revert "Revert "Merge branch 'master' of https://git.bib.de/PBS2H23AMA/PMC_Projekt""

This reverts commit a63f4e4b87.
This commit is contained in:
NBMANTZELOS\bib 2024-06-14 10:44:40 +02:00
parent a63f4e4b87
commit 0c6c6cd74b
4 changed files with 29 additions and 0 deletions

View File

@ -38,9 +38,15 @@
"Title": "Program.cs",
"DocumentMoniker": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
"RelativeDocumentMoniker": "PMCProjekt\\Program.cs",
<<<<<<< HEAD
"ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs*",
"RelativeToolTip": "PMCProjekt\\Program.cs*",
"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|",
"WhenOpened": "2024-05-29T10:43:22.805Z",
"EditorCaption": ""

View File

@ -42,7 +42,11 @@ namespace PMCProjekt
MySql.Data.MySqlClient.MySqlConnection myConnection;
string myConnectionString;
//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=vr_contact";
>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
try
{
@ -53,18 +57,29 @@ namespace PMCProjekt
// create a MySQL command and set the SQL statement with parameters
MySqlCommand myCommand = new MySqlCommand();
myCommand.Connection = myConnection;
<<<<<<< HEAD
myCommand.CommandText = @"SELECT * FROM user";
//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
using MySqlDataReader myReader = myCommand.ExecuteReader();
while (myReader.Read())
{
<<<<<<< HEAD
int id = myReader.GetInt32("id");
string name = myReader.GetString("firstname");
string nachname = myReader.GetString("lastname");
Console.WriteLine(id + " " + nachname + " " + name);
=======
int id = myReader.GetInt32("maxParticipants");
string name = myReader.GetString("title");
Console.WriteLine(id + " " + name);
>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
}
myConnection.Close();

View File

@ -14,7 +14,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("PMCProjekt")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[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.AssemblyTitleAttribute("PMCProjekt")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1,5 @@
<<<<<<< HEAD
3bf2454e1464aab8822817168f63b8e3c2fd9507ec42922ba8a9ca9671eb53e1
=======
a1838728addb127ce57187402831e23d5da8b8644680230e2f61341fb5e73c1a
>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23