[Nhibernate-commit] SF.net SVN: nhibernate:[3841] trunk/nhibernate/src/NHibernate

[<aye...@us...>]

Revision: 3841
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3841&view=rev
Author:   ayenderahien
Date:     2008-10-11 05:54:37 +0000 (Sat, 11 Oct 2008)

Log Message:
-----------
fixing broken build

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Dialect/SQLiteDialect.cs
    trunk/nhibernate/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Dialect/SQLiteDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SQLiteDialect.cs	2008-10-11 04:46:05 UTC (rev 3840)
+++ trunk/nhibernate/src/NHibernate/Dialect/SQLiteDialect.cs	2008-10-11 05:54:37 UTC (rev 3841)
@@ -114,8 +114,8 @@
 		{
 			StringBuilder qualifiedName = new StringBuilder();
 		    bool quoted = false;
-
-			if (!string.IsNullOrEmpty(catalog))
+			
+            if (!string.IsNullOrEmpty(catalog))
 			{
                 if (catalog.StartsWith(OpenQuote.ToString()))
                 {
@@ -133,12 +133,12 @@
 			{
 				if (schema.StartsWith(OpenQuote.ToString()))
 				{
-				    schema = schema.Substring(0, schema.Length - 1);
+                    schema = schema.Substring(1, schema.Length - 1);
 				    quoted = true;
 				}
-                if (schema.EndsWith(OpenQuote.ToString()))
+                if (schema.EndsWith(CloseQuote.ToString()))
                 {
-                    schema = schema.Substring(1, schema.Length - 1);
+                    schema = schema.Substring(0, schema.Length - 1);
                     quoted = true;
                 } 
                 qualifiedName.Append(schema).Append(StringHelper.Underscore);
@@ -149,7 +149,7 @@
 			    table = table.Substring(1, table.Length - 1);
 			    quoted = true;
 			}
-            if (table.EndsWith(OpenQuote.ToString()))
+            if (table.EndsWith(CloseQuote.ToString()))
             {
                 table = table.Substring(0, table.Length - 1);
                 quoted = true;

Modified: trunk/nhibernate/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs	2008-10-11 04:46:05 UTC (rev 3840)
+++ trunk/nhibernate/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs	2008-10-11 05:54:37 UTC (rev 3841)
@@ -31,7 +31,7 @@
             Assert.AreEqual("SELECT id, name, email FROM Users limit 10, 5", s.ToString());
         }
 
-        [Test, Ignore("was broken in r3839")]
+        [Test]
         public void QuotedSchemaNameWithSqlLite()
         {
             Table tbl = new Table();
@@ -39,7 +39,7 @@
             tbl.Name = "`name`";
 
             Assert.AreEqual("\"schema_name\"", tbl.GetQualifiedName(dialect));
-            Assert.AreEqual("\"schema_table\"", dialect.Qualify("","\"schema\"", "\"table\""));
+            Assert.AreEqual("\"schema_table\"", dialect.Qualify("", "\"schema\"", "\"table\""));
         }
 
         [Test]
@@ -51,8 +51,8 @@
             Assert.AreEqual("\"name\"", tbl.GetQualifiedName(dialect));
         }
 
-				[Test, Ignore("was broken in r3839")]
-				public void QuotedSchemaNameWithUnqoutedTableInSqlLite()
+        [Test]
+        public void QuotedSchemaNameWithUnqoutedTableInSqlLite()
         {
             Table tbl = new Table();
             tbl.Schema = "`schema`";
@@ -62,8 +62,8 @@
             Assert.AreEqual("\"schema_table\"", dialect.Qualify("", "\"schema\"", "table"));
         }
 
-				[Test, Ignore("was broken in r3839")]
-				public void QuotedCatalogSchemaNameWithSqlLite()
+        [Test]
+        public void QuotedCatalogSchemaNameWithSqlLite()
         {
             Table tbl = new Table();
             tbl.Catalog = "dbo";
@@ -92,7 +92,7 @@
             tbl.Name = "name";
 
             Assert.AreEqual("schema_name", tbl.GetQualifiedName(dialect));
-            Assert.AreEqual("schema_table", dialect.Qualify("","schema","table"));
+            Assert.AreEqual("schema_table", dialect.Qualify("", "schema", "table"));
         }
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.