Changeset 3972

Timestamp:

06/28/10 19:21:50 (14 years ago)

Author:

hmayr

Message:

minor changes (#1046)

File:

• branches/HeuristicLab.Services.Authentication Prototype/Persistence/DatabaseUtil.cs (modified) (4 diffs)

branches/HeuristicLab.Services.Authentication Prototype/Persistence/DatabaseUtil.cs

@@ -2 +2 @@
 using System.Diagnostics;
 using System.Data.Common;
+using Persistence.Properties;
 
 namespace Persistence {
@@ -9 +10 @@
   public class DatabaseUtil {
 
-    protected static bool productionDatabase = true;
+    public static bool ProductionDatabase { get; set; }
 
-    public static bool ProductionDatabase {
-      get {
-        return DatabaseUtil.productionDatabase;
-      }
-      set {
-        DatabaseUtil.productionDatabase = value;
-      }
-    }
-    
     /// <summary>
     /// creates and returns a database connection, if possible
@@ -25 +17 @@
     /// <returns>database connection (could be null)</returns>
     public static DataClassesDataContext createDataClassesDataContext() {
-      if (productionDatabase) {
-        return new Persistence.DataClassesDataContext(new Persistence.Properties.Settings().DatabaseConnectionString);
-      } else {
-        return new Persistence.DataClassesDataContext(new Persistence.Properties.Settings().DatabaseConnectionStringTesting);
-      }
+      return new DataClassesDataContext(
+        ProductionDatabase ? new Settings().DatabaseConnectionString : new Settings().DatabaseConnectionStringTesting);
     }
 
@@ -37 +26 @@
     /// <param name="db">DataClassesDataContext</param>
     public static void createDatabase(DataClassesDataContext db) {
-        
+      // delete old database
       if (db.DatabaseExists()) {
-        Console.WriteLine("Deleting old database...");
         db.DeleteDatabase();
-        Console.WriteLine("Deleted old database!");
       }
 
-      Console.WriteLine("Creating new database...");
+      // create new database
       db.CreateDatabase();
-      
+
       DbCommand command = db.Connection.CreateCommand();
       command.CommandText = "CREATE UNIQUE NONCLUSTERED INDEX [IDXRoleName] ON [dbo].[HeuristicLabRole](  [roleName] ASC)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]";
       command.ExecuteNonQuery();
-
       command.CommandText = "CREATE UNIQUE NONCLUSTERED INDEX [IDXUserName] ON [dbo].[HeuristicLabUser](  [UserName] ASC)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]";
       command.ExecuteNonQuery();
       command.CommandText = "CREATE UNIQUE NONCLUSTERED INDEX [IDXUserEmail] ON [dbo].[HeuristicLabUser](   [Email] ASC)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]";
       command.ExecuteNonQuery();
-      Console.WriteLine("Created new database!");
     }
   }