Commit 0c351488 authored by Marco De Marco's avatar Marco De Marco
Browse files

Response class modified, Message class removed

parent 33c0daca
Loading
Loading
Loading
Loading
+12 −10
Original line number Diff line number Diff line
@@ -16,13 +16,14 @@ message Response

	message Authorization
	{
		enum Status
		enum State
		{
			ACCEPTED = 0;
			REJECTED = 1;
		}

		required Status status = 1;
		required State state = 1;
		required string status = 2;
	}

	optional Authorization authorization = 2;
@@ -33,13 +34,14 @@ message Response
	{
		//Metadata response status

		enum Status
		enum State
		{
			ACCEPTED = 0;
			REJECTED = 1;
		}

		required Status status = 1;
		required State state = 1;
		required string status = 2;

		//Mysql: FLOAT, DOUBLE, DECIMAL
		//SOCI:  dt_double
@@ -51,7 +53,7 @@ message Response
			required double value = 2;
		}

		repeated DtDouble double_list = 2;
		repeated DtDouble double_list = 3;

		//Mysql: TINYINT, SMALLINT, INT, BIGINT
		//SOCI:  dt_integer 
@@ -63,7 +65,7 @@ message Response
			required int32 value = 2;
		}

		repeated DtInteger integer_list = 3;
		repeated DtInteger integer_list = 4;

		//Mysql: not used with mysql, needed for postgres
		//SOCI:  dt_unsigned_long 
@@ -75,7 +77,7 @@ message Response
			required uint64 value = 2;
		}

		repeated DtUnsignedLong unsinged_long_list = 4;
		repeated DtUnsignedLong unsinged_long_list = 5;

		//Mysql: not used with mysql, needed for postgres
		//SOCI:  dt_long_long
@@ -87,7 +89,7 @@ message Response
			required int64 value = 2;
		}

		repeated DtLongLong long_long_list = 5;
		repeated DtLongLong long_long_list = 6;

		//Mysql: STRING/BINARY, VARCHAR/VARBINARY
		//SOCI:  dt_string
@@ -99,7 +101,7 @@ message Response
			required string value = 2;
		}

		repeated DtString strings_list = 6;
		repeated DtString strings_list = 7;

		//Mysql: TIMESTAMP DATE, TIME, DATETIME
		//SOCI:  dt_date 
@@ -111,7 +113,7 @@ message Response
			required sfixed64 value = 2;
		}

		repeated DtDate date_list = 7;
		repeated DtDate date_list = 8;
	}

	optional Metadata metadata = 3;
+29 −0
Original line number Diff line number Diff line
@@ -81,6 +81,35 @@ public:
	unsigned int getDatabasePort() const { return m_databasePort; };
	std::string getDatabaseUsername() const { return m_databaseUsername; };
	std::string getDatabasePassword() const { return m_databasePassword; };
    ExportedTablesMap& getExportedTablesMap() const { return m_exportedTablesMap; }

    bool find(const std::string schema, const std::string table)
    {
        std::pair<ExportedTablesMap::const_iterator, ExportedTablesMap::const_iterator > ret;

        ret = m_exportedTablesMap.equal_range(schema);

        ExportedTablesMap::const_iterator it;

        for(it=ret.first; it!=ret.second; ++it)
        {
            if(it->second.compare(table) == 0)
                return true;
        }

        return false;
    }

    bool isUserAuthorized(const std::string username, const std::string password)
    {
        AuthorisedUsersMap::const_iterator it = m_authorisedUsersMap.find(username);

        if(it!=m_authorisedUsersMap.end() &&
            it->second.compare(password)==0)
            return true;

        return false;
    }

protected:
//------------------------------------------------------------------------------

src/Message.pb.cc

deleted100644 → 0
+0 −2341

File deleted.

Preview size limit exceeded, changes collapsed.

src/Message.pb.h

deleted100644 → 0
+0 −1758

File deleted.

Preview size limit exceeded, changes collapsed.

+246 −129

File changed.

Preview size limit exceeded, changes collapsed.

Loading