From a5f24411433aeb61ad015129354a664820affab0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 12 Dec 2012 11:26:44 +0200
Subject: Add support for SQL name transformations

---
 odb/relational/sqlite/context.cxx |  2 ++
 odb/relational/sqlite/schema.cxx  | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'odb/relational/sqlite')

diff --git a/odb/relational/sqlite/context.cxx b/odb/relational/sqlite/context.cxx
index 5dc3fa8..5e46c77 100644
--- a/odb/relational/sqlite/context.cxx
+++ b/odb/relational/sqlite/context.cxx
@@ -85,6 +85,8 @@ namespace relational
       insert_send_auto_id = true;
       delay_freeing_statement_result = false;
       need_image_clone = false;
+      global_index = true;
+      global_fkey = false;
       data_->bind_vector_ = "sqlite::bind*";
       data_->truncated_vector_ = "bool*";
 
diff --git a/odb/relational/sqlite/schema.cxx b/odb/relational/sqlite/schema.cxx
index 8efef66..1d4b1d2 100644
--- a/odb/relational/sqlite/schema.cxx
+++ b/odb/relational/sqlite/schema.cxx
@@ -56,14 +56,11 @@ namespace relational
         virtual string
         name (sema_rel::index& in)
         {
-          // In SQLite, index names are database-global. Make them unique
-          // by prefixing the index name with table name (preserving the
-          // database).
+          // In SQLite, index names can be qualified with the database.
           //
-          sema_rel::qname n (
-            static_cast<sema_rel::table&> (in.scope ()).name ());
-
-          n.uname () += "_" + in.name ();
+          sema_rel::table& t (static_cast<sema_rel::table&> (in.scope ()));
+          sema_rel::qname n (t.name ().qualifier ());
+          n.append (in.name ());
           return quote_id (n);
         }
 
-- 
cgit v1.1